summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/deb/dpkgpm.cc62
-rw-r--r--apt-pkg/init.cc1
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--cmdline/apt-get.cc9
-rwxr-xr-xcmdline/apt-key44
-rw-r--r--debian/apt.conf.changelog6
-rw-r--r--debian/apt.cron.daily12
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog2587
-rw-r--r--debian/control11
-rwxr-xr-xdebian/rules5
-rw-r--r--doc/apt-key.8.xml10
-rw-r--r--doc/examples/sources.list.in12
-rw-r--r--doc/makefile2
-rw-r--r--doc/po/apt-doc.pot12
-rw-r--r--doc/po/de.po28
-rw-r--r--doc/po/es.po21
-rw-r--r--doc/po/fr.po21
-rw-r--r--doc/po/it.po12
-rw-r--r--doc/po/ja.po21
-rw-r--r--doc/po/pl.po21
-rw-r--r--doc/po/pt.po21
-rw-r--r--doc/po/pt_BR.po12
-rw-r--r--po/apt-all.pot187
-rw-r--r--po/ar.po187
-rw-r--r--po/ast.po227
-rw-r--r--po/bg.po285
-rw-r--r--po/bs.po187
-rw-r--r--po/ca.po267
-rw-r--r--po/cs.po224
-rw-r--r--po/cy.po224
-rw-r--r--po/da.po260
-rw-r--r--po/de.po271
-rw-r--r--po/dz.po222
-rw-r--r--po/el.po222
-rw-r--r--po/es.po227
-rw-r--r--po/eu.po224
-rw-r--r--po/fi.po222
-rw-r--r--po/fr.po300
-rw-r--r--po/gl.po227
-rw-r--r--po/hu.po276
-rw-r--r--po/it.po298
-rw-r--r--po/ja.po225
-rw-r--r--po/km.po222
-rw-r--r--po/ko.po224
-rw-r--r--po/ku.po226
-rw-r--r--po/lt.po224
-rw-r--r--po/mr.po222
-rw-r--r--po/nb.po227
-rw-r--r--po/ne.po223
-rw-r--r--po/nl.po227
-rw-r--r--po/nn.po222
-rw-r--r--po/pl.po267
-rw-r--r--po/pt.po227
-rw-r--r--po/pt_BR.po225
-rw-r--r--po/ro.po223
-rw-r--r--po/ru.po267
-rw-r--r--po/sk.po267
-rw-r--r--po/sl.po293
-rw-r--r--po/sv.po226
-rw-r--r--po/th.po222
-rw-r--r--po/tl.po222
-rw-r--r--po/uk.po222
-rw-r--r--po/vi.po232
-rw-r--r--po/zh_CN.po223
-rw-r--r--po/zh_TW.po222
-rwxr-xr-xprepare-release4
-rw-r--r--share/apt-auth-failure.note11
-rw-r--r--share/ubuntu-archive.gpgbin0 -> 1724 bytes
-rw-r--r--test/integration/exploid-keyring-with-dupe-keys.pubbin0 -> 3986 bytes
-rw-r--r--test/integration/exploid-keyring-with-dupe-subkeys.pubbin0 -> 2016 bytes
-rwxr-xr-xtest/integration/test-apt-key-net-update95
-rwxr-xr-xtest/integration/test-bug-666772-multiarch-arch-all-build-deps118
73 files changed, 8691 insertions, 4589 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 296426c80..7e937a85b 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -29,7 +29,6 @@
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
-#include <string.h>
#include <stdio.h>
#include <string.h>
#include <algorithm>
@@ -1461,7 +1460,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
string::size_type pos;
FILE *report;
- if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
+ if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
{
std::clog << "configured to not write apport reports" << std::endl;
return;
@@ -1488,18 +1487,49 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
}
// do not report out-of-memory failures
- if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
+ if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
+ strstr(errormsg, "failed to allocate memory") != NULL) {
std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
return;
}
- // do not report dpkg I/O errors
- // XXX - this message is localized, but this only matches the English version. This is better than nothing.
- if(strstr(errormsg, "short read in buffer_copy (")) {
- std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
+ // do not report bugs regarding inaccessible local files
+ if(strstr(errormsg, strerror(ENOENT)) != NULL ||
+ strstr(errormsg, "cannot access archive") != NULL) {
+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
+ return;
+ }
+
+ // do not report errors encountered when decompressing packages
+ if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
return;
}
+ // do not report dpkg I/O errors, this is a format string, so we compare
+ // the prefix and the suffix of the error with the dpkg error message
+ vector<string> io_errors;
+ io_errors.push_back(string("failed to read on buffer copy for %s"));
+ io_errors.push_back(string("failed in write on buffer copy for %s"));
+ io_errors.push_back(string("short read on buffer copy for %s"));
+
+ for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++)
+ {
+ vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%');
+ if (list.size() > 1) {
+ // we need to split %s, VectorizeString only allows char so we need
+ // to kill the "s" manually
+ if (list[1].size() > 1) {
+ list[1].erase(0, 1);
+ if(strstr(errormsg, list[0].c_str()) &&
+ strstr(errormsg, list[1].c_str())) {
+ std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
+ return;
+ }
+ }
+ }
+ }
+
// get the pkgname and reportfile
pkgname = flNotDir(pkgpath);
pos = pkgname.find('_');
@@ -1589,6 +1619,24 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
{
while( fgets(buf, sizeof(buf), log) != NULL)
fprintf(report, " %s", buf);
+ fprintf(report, " \n");
+ fclose(log);
+ }
+ }
+
+ // attach history log it if we have it
+ string histfile_name = _config->FindFile("Dir::Log::History");
+ if (!histfile_name.empty())
+ {
+ FILE *log = NULL;
+ char buf[1024];
+
+ fprintf(report, "DpkgHistoryLog:\n");
+ log = fopen(histfile_name.c_str(),"r");
+ if(log != NULL)
+ {
+ while( fgets(buf, sizeof(buf), log) != NULL)
+ fprintf(report, " %s", buf);
fclose(log);
}
}
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 76278921f..4818174ac 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -92,6 +92,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
// Default cdrom mount point
Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 46fc499c6..80369dd1a 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -338,7 +338,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
however if there is a loop (A depends on B, B depends on A) this will not
be the case, so check for dependencies before configuring. */
bool Bad = false, Changed = false;
- const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
unsigned int i=0;
do
{
@@ -602,7 +602,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
or by the ConfigureAll call at the end of the for loop in OrderInstall. */
bool Changed = false;
- const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
unsigned int i = 0;
do
{
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d4c7f4200..ccbe54384 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2937,7 +2937,7 @@ bool DoBuildDep(CommandLine &CmdL)
for (; Ver != verlist.end(); ++Ver)
{
forbidden.clear();
- if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+ if (Ver->MultiArch == pkgCache::Version::None)
{
if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
@@ -2952,7 +2952,7 @@ bool DoBuildDep(CommandLine &CmdL)
forbidden = "Multi-Arch: same";
// :native gets the buildArch
}
- else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
+ else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All)
{
if (colon != string::npos)
forbidden = "Multi-Arch: foreign";
@@ -3239,7 +3239,10 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
return true;
// error
- return _error->Error("changelog download failed");
+ pkgRecords Recs(CacheFile);
+ pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
+ string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
+ return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str());
}
/*}}}*/
// DisplayFileInPager - Display File with pager /*{{{*/
diff --git a/cmdline/apt-key b/cmdline/apt-key
index c184e3e75..166508c8e 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -17,13 +17,13 @@ fi
GPG="$GPG_CMD"
-MASTER_KEYRING=""
-ARCHIVE_KEYRING_URI=""
-#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
-#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+# ubuntu keyrings
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg
+TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg
requires_root() {
if [ "$(id -u)" -ne 0 ]; then
@@ -35,7 +35,7 @@ requires_root() {
add_keys_with_verify_against_master_keyring() {
ADD_KEYRING=$1
MASTER=$2
-
+
if [ ! -f "$ADD_KEYRING" ]; then
echo "ERROR: '$ADD_KEYRING' not found"
return
@@ -50,12 +50,28 @@ add_keys_with_verify_against_master_keyring() {
# all keys that are exported must have a valid signature
# from a key in the $distro-master-keyring
add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
+ all_add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^[ps]ub | cut -d: -f5`
master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
+
+ # ensure there are no colisions LP: #857472
+ for all_add_key in $all_add_keys; do
+ for master_key in $master_keys; do
+ if [ "$all_add_key" = "$master_key" ]; then
+ echo >&2 "Keyid collision for '$all_add_key' detected, operation aborted"
+ return 1
+ fi
+ done
+ done
+
for add_key in $add_keys; do
- ADDED=0
+ # export the add keyring one-by-one
+ rm -f $TMP_KEYRING
+ $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key
+ # check if signed with the master key and only add in this case
+ ADDED=0
for master_key in $master_keys; do
- if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
- $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import
+ if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then
+ $GPG --import $TMP_KEYRING
ADDED=1
fi
done
@@ -63,12 +79,16 @@ add_keys_with_verify_against_master_keyring() {
echo >&2 "Key '$add_key' not added. It is not signed with a master key"
fi
done
+ rm -f $TMP_KEYRING
}
# update the current archive signing keyring from a network URI
# the archive-keyring keys needs to be signed with the master key
# (otherwise it does not make sense from a security POV)
net_update() {
+ # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128))
+ exit 1
+
if [ -z "$ARCHIVE_KEYRING_URI" ]; then
echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"
exit 1
@@ -88,7 +108,7 @@ net_update() {
if [ -e $keyring ]; then
old_mtime=$(stat -c %Y $keyring)
fi
- (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
+ (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI)
if [ ! -e $keyring ]; then
return
fi
@@ -102,7 +122,7 @@ net_update() {
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
requires_root
diff --git a/debian/apt.conf.changelog b/debian/apt.conf.changelog
new file mode 100644
index 000000000..c4092ff44
--- /dev/null
+++ b/debian/apt.conf.changelog
@@ -0,0 +1,6 @@
+// Server information for apt-changelog
+APT {
+ Changelogs {
+ Server "http://changelogs.ubuntu.com/changelogs";
+ };
+};
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 6f6dc92a4..4507c6858 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -434,6 +434,13 @@ fi
UPDATED=0
UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
if check_stamp $UPDATE_STAMP $UpdateInterval; then
+ # check for a new archive signing key (against the master keyring)
+ if eval apt-key net-update $XSTDERR; then
+ debug_echo "apt-key net-update (success)"
+ else
+ debug_echo "apt-key net-update (failure)"
+ fi
+ # run apt-get update
if eval apt-get $XAPTOPT -y update $XSTDERR; then
debug_echo "download updated metadata (success)."
if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
@@ -447,6 +454,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then
fi
update_stamp $UPDATE_STAMP
UPDATED=1
+ # now run apt-xapian-index if it is installed to ensure the index
+ # is up-to-date
+ if [ -x /usr/sbin/update-apt-xapian-index ]; then
+ nice ionice -c3 update-apt-xapian-index -q -u
+ fi
else
debug_echo "download updated metadata (error)"
fi
diff --git a/debian/apt.dirs b/debian/apt.dirs
index f9c0b6c3e..828453655 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -13,4 +13,5 @@ var/lib/apt/lists/partial
var/lib/apt/mirrors/partial
var/lib/apt/periodic
var/log/apt
+usr/share/apt
usr/share/bug/apt
diff --git a/debian/changelog b/debian/changelog
index 1505aad53..2f6dbbd28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.9.7.1ubuntu1) quantal; urgency=low
+
+ * merged from the debian-sid branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jun 2012 15:33:42 +0200
+
apt (0.9.7.1) unstable; urgency=low
[ Program translation updates ]
@@ -56,6 +62,44 @@ apt (0.9.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 19 Jun 2012 16:42:43 +0200
+apt (0.9.6ubuntu3) quantal; urgency=low
+
+ * SECURITY UPDATE: Disable apt-key net-update for now, as validation
+ code is still insecure
+ - cmdline/apt-key: exit 1 immediately in net_update()
+ - CVE-2012-0954
+ - LP: #1013639
+
+ -- Jamie Strandboge <jamie@ubuntu.com> Fri, 15 Jun 2012 08:03:17 -0500
+
+apt (0.9.6ubuntu2) quantal; urgency=low
+
+ * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to
+ Marc Deslauriers. (LP: #1013128)
+
+ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 Jun 2012 11:29:48 -0500
+
+apt (0.9.6ubuntu1) quantal; urgency=low
+
+ [ Michael Vogt ]
+ * merged from Debian, remaining changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+ - APT::pkgPackageManager::MaxLoopCount set to 5000
+ - apport pkgfailure handling
+ - ubuntu changelog download handling
+ - patch for apt cross-building, see http://bugs.debian.org/666772
+
+ [ Steve Langasek ]
+ * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
+ removed in previous LTS.
+ * prepare-release: declare the packages needed as source build deps.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Jun 2012 22:36:16 +0000
+
apt (0.9.6) unstable; urgency=low
[ David Kalnischkies ]
@@ -566,6 +610,152 @@ apt (0.8.16~exp13) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 18:12:57 +0100
+apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low
+
+ [ Malcolm Scott ]
+ * apt-pkg/packagemanager.cc:
+ - Fix a regression in the pre-depend handling: where a pre-depend option
+ other than the first specified is already installed, apt-get enters an
+ infinite loop (LP: #985852)
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.cc:
+ - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+ ordering code does not get into a endless loop when it flip-flops
+ between two states
+
+ [ David Kalnischkies ]
+ * apt-pkg/cacheset.cc:
+ - actually return to the fallback modifier if we have detected we
+ should for packagenames which look like modifiers (Closes: #669591)
+ LP: #982716
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 20 Apr 2012 11:10:12 +0200
+
+apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
+
+ * apt-inst/contrib/extracttar.cc:
+ - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
+ that the pipe is closed when InFd is closed. This fixes a Fd leak
+ (LP: #985452)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Apr 2012 11:38:43 +0200
+
+apt (0.8.16~exp12ubuntu8) precise; urgency=low
+
+ * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 12 Apr 2012 16:26:20 -0600
+
+apt (0.8.16~exp12ubuntu7) precise; urgency=low
+
+ * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
+ dropped in maverick.
+ * Build-depend on gettext:any for cross-building support.
+ * Don't treat build-depends-indep as cross-build-dependencies; we should
+ always install the host arch versions. LP: #968828.
+ * Makefile, po/makefile: make sure our pot generation datestamp doesn't
+ change at build time, since this makes translations fail to be
+ co-installable with multiarch. Based on a patch by David Kalnischkies.
+ Closes: #659333, LP: #924628.
+ * For cross-build-dependencies, Architecture: all packages should be
+ treated as implicitly Multi-Arch: foreign, because either they *are*
+ M-A: foreign when used as a build-dependency, or they need to be updated
+ to not be Architecture: all; and since cross-build-deps are new
+ functionality in apt, we can safely make this change without breaking
+ existing systems. Closes: #666772.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 05 Apr 2012 18:00:23 -0700
+
+apt (0.8.16~exp12ubuntu6) precise; urgency=low
+
+ * cherry pick from
+ http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/:
+ * apt-pkg/packagemanager.cc:
+ - fix bug in predepends handling - ensure that packages that needs
+ unpackaging are unpacked before they are configured (LP: #927993)
+ * apt-pkg/packagemanager.cc:
+ - do not try to a void a breaks if the broken package pre-depends
+ on the breaker, but let dpkg auto-deconfigure it
+ * apt-pkg/packagemanager.cc:
+ - recheck all dependencies if we changed a package in SmartConfigure
+ as this could break an earlier dependency (LP: #940396)
+ * recheck dependencies in SmartUnpack after a change, too
+ * add Debug::pkgAcqArchive::NoQueue to disable package downloading
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Mar 2012 19:46:08 +0100
+
+apt (0.8.16~exp12ubuntu5) precise; urgency=low
+
+ [ Michael Vogt ]
+ * merged from the debian-sid branch, most notably:
+ - Correct fi translation for hash sum mismatches (LP: #420403)
+ Thanks to Jani Uusitalo
+ - remove 'old' InRelease file if we can't get a new one before
+ proceeding with Release.gpg to avoid the false impression of a still
+ trusted repository by a (still present) old InRelease file.
+ Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Mar 2012 17:52:50 +0100
+
+apt (0.8.16~exp12ubuntu4) precise; urgency=low
+
+ * apt-pkg/contrib/fileutl.h:
+ - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Feb 2012 10:06:28 +0100
+
+apt (0.8.16~exp12ubuntu3) precise; urgency=low
+
+ * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+ handle compressed files again (LP: #924182).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 31 Jan 2012 11:19:46 +0000
+
+apt (0.8.16~exp12ubuntu2) precise; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - chroot if needed before dpkg --assert-multi-arch
+ - ensure that dpkg binary doesn't have the chroot-directory prefixed
+ * apt-pkg/depcache.cc:
+ - if a M-A:same package is marked for reinstall, mark all it's installed
+ silbings for reinstallation as well (LP: #859188)
+ * apt-pkg/contrib/configuration.cc:
+ - do not stop parent transversal in FindDir if the value is empty
+ * methods/http{s,}.cc:
+ - if a file without an extension is requested send an 'Accept: text/*'
+ header to avoid that the server chooses unsupported compressed files
+ in a content-negotation attempt (Closes: #657560)
+ * apt-pkg/aptconfiguration.cc:
+ - chroot if needed before calling dpkg --print-foreign-architectures
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix crash when a package is in removed but residual config state
+ (LP: #923807)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Jan 2012 21:03:12 +0100
+
+apt (0.8.16~exp12ubuntu1) precise; urgency=low
+
+ [ Michael Vogt ]
+ * merge from debian/experimental:
+ - new ABI
+
+ [ Steve Langasek ]
+ * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
+ we resolve virtual package Breaks more effectively. Thanks to Colin
+ Watson for the patch. Closes: #657695, LP: #922485.
+ * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
+ a signed short, because large upgrades can result in an overflow for
+ core packages. Thanks again to Colin Watson. Closes: #657732,
+ LP: #917173.
+ * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
+ Closes: #646288.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 29 Jan 2012 00:44:16 +0000
+
apt (0.8.16~exp12) experimental; urgency=low
[ Michael Vogt ]
@@ -623,10 +813,10 @@ apt (0.8.16~exp10) experimental; urgency=low
* apt-pkg/contrib/fileutl.h:
- store the offset in the internal fd before calculate size of
the zlib-handled file to jump back to this place again
- * apt-pkg/aptconfiguration.cc:
- - parse dpkg --print-foreign-architectures correctly in
- case archs are separated by newline instead of space, too.
- (Closes: #655590)
+ [ David Kalnischkies ]
+ [ Michael Vogt ]
+ * apt-pkg/contrib/fileutl.h:
+ - fix segfault triggered by the python-apt testsuite
[ Michael Vogt ]
* apt-pkg/contrib/fileutl.h:
@@ -661,6 +851,7 @@ apt (0.8.16~exp9) experimental; urgency=low
commands accepting lists of packages, e.g. policy (Closes: #625960)
* apt-pkg/depcache.cc:
- prefer native providers over foreigns even if the chain is foreign
+ LP: #850264.
* cmdline/apt-get.cc:
- ignore foreign architectures if we check if a provides has only one
resolver as it's basically the same for the user, so no need to choose
@@ -758,15 +949,198 @@ apt (0.8.16~exp6) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 21:06:51 +0200
+apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low
+
+ [ Daniel Hahler ]
+ * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200
+
+apt (0.8.16~exp5ubuntu14.2) precise; urgency=low
+
+ * Call update-apt-xapian-index with -u on all arches in
+ cron.daily to make it behave slightly more pleasantly.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Mon, 09 Jan 2012 07:41:03 -0700
+
+apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
+
+ * apt-pkg/edsp.cc:
+ - fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 17:56:49 +0200
+
+apt (0.8.16~exp5ubuntu14) precise; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - refactor MergeList by creating -Group, -Package and -Version specialist
+ - share description list between "same" versions (LP: #868977)
+ This also means that descriptions are shared across archives now.
+ * apt-pkg/pkgcache.cc:
+ - always prefer "en" over "" for "en"-language regardless of cache-order
+ (LP: #868977)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 16:22:31 +0200
+
+apt (0.8.16~exp5ubuntu13) oneiric; urgency=low
+
+ [ Adam Conrad ]
+ * On armel, call update-apt-xapian-index with '-u' to keep the CPU
+ and I/O usage low. We would do this on all arches, but there's a
+ regression risk here, but that's better than killing slow systems.
+
+ [ Michael Vogt ]
+ * cmdline/apt-key:
+ - fix apt-key net-update, thanks to Marc Deslauriers and
+ Adam Conrad for the code review (LP: #857472)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 06 Oct 2011 16:14:41 +0200
+
+apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/deblistparser.cc:
+ - fix crash when the dynamic mmap needs to be remapped during
+ LoadReleaseInfo (LP: #854090)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Sep 2011 13:31:11 +0200
+
+apt (0.8.16~exp5ubuntu11) oneiric; urgency=low
+
+ [ Colin Watson ]
+ * ftparchive/cachedb.cc:
+ - fix buffersize in bytes2hex
+
+ [ Marc Deslauriers ]
+ * SECURITY UPDATE: Disable apt-key net-update for now, as validation
+ code is insecure.
+ - cmdline/apt-key: exit immediately out of net_update().
+ - CVE number pending
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 22 Sep 2011 17:30:45 +0200
+
+apt (0.8.16~exp5ubuntu10) oneiric; urgency=low
+
+ * methods/https.cc:
+ - cleanup broken downloads properly (just like http)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 20 Sep 2011 18:26:13 +0200
+
+apt (0.8.16~exp5ubuntu9) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+ - fix fetching translated package descriptions (including the newly
+ stripped out english ones) by adding OptionalSubIndexTarget
+
+ [ David Kalnischkies ]
+ * apt-pkg/acquire-item.cc:
+ - if no Release.gpg file is found try to verify with hashes,
+ but do not fail if a hash can't be found
+ * apt-pkg/indexrecords.cc:
+ - fix Acquire::Max-ValidTime option by interpreting it really
+ as seconds as specified in the manpage and not as days
+ - add an Acquire::Min-ValidTime option (Closes: #640122)
+ * doc/apt.conf.5.xml:
+ - reword Acquire::Max-ValidTime documentation to make clear
+ that it doesn't provide the new Min-ValidTime functionality
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 16 Sep 2011 09:50:16 +0200
+
+apt (0.8.16~exp5ubuntu8) oneiric; urgency=low
+
+ * cherry pick r1825 from lp:~mvo/apt/mvo:
+ * apt-pkg/contrib/configuration.cc:
+ - fix double delete (LP: #848907)
+ - ignore only the invalid regexp instead of all options
+
+ * cherry pick r2165 from lp:~donkult/apt/sid:
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - output list of virtual package providers to c1out in -q=1
+ instead of /dev/null to unbreak sbuild (LP: #816155)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 18:23:09 +0200
+
+apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * cherry pick revision 2173 from lp:~donkult/apt/sid
+
+ [ David Kalnischkies ]
+ - M-A:same lockstep unpack should operate on installed
+ packages first (LP: #835625)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 09:03:33 +0200
+
+apt (0.8.16~exp5ubuntu6) oneiric; urgency=low
+
+ [ Michael Vogt
+ * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
+ Jonathan Riddell
+
+ [ David Kalnischkies ]
+ * lots of cppcheck fixes
+ * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
+ - ignore "self"-conflicts for all architectures of a package
+ instead of just for the architecture of the package locked at
+ in the ordering of installations too (Closes: #802901)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Aug 2011 11:32:58 +0200
+
+apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
+
+ * debian/control:
+ - fix VCS location
+ * methods/mirror.cc:
+ - include the architecture(s) in the query string as well so
+ that the server can make better decisions
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:03:19 +0200
+
+apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
+
+ * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
+ to a hard dependency to match Debian behaviour and fix LP: #816606
+
+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 09 Aug 2011 14:48:24 -0600
+
+apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
+
+ * apt-pkg/acquire.cc:
+ - fix potential divide-by-zero (LP: #823277)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 15:56:44 +0200
+
+apt (0.8.16~exp5ubuntu2) oneiric; urgency=low
+
+ * test/integration/test-hashsum-verification:
+ - add regression test for hashsum verification
+ * apt-pkg/acquire-item.cc:
+ - if no Release.gpg file is found, still load the hashes for
+ verification (closes: #636314) and add test
+ * apt-pkg/pkgcachegen.cc:
+ - fix incorrect comparision when checking sources.list freshness
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 09:22:14 +0200
+
+apt (0.8.16~exp5ubuntu1) oneiric; urgency=low
+
+ * merged new version from debian/experimental, this includes
+ a ABI break and two new library packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 08 Aug 2011 14:30:07 +0200
+
apt (0.8.16~exp5) experimental; urgency=low
- * merged the latest debian-sid fixes
* apt-pkg/makefile:
- install sha256.h compat header
* apt-pkg/pkgcachegen.{cc,h}:
- use ref-to-ptr semantic in NewDepends() to ensure that the
libapt does not segfault if the cache is remapped in between
(LP: #812862)
+ (LP: #812862)
- fix crash when P.Arch() was used but the cache got remapped
* apt-pkg/acquire-item.{cc,h}:
- do not check for a "Package" tag in optional index targets
@@ -892,6 +1266,10 @@ apt (0.8.15.10) unstable; urgency=high
- show a debug why a package was kept by ResolveByKeep()
* doc/manpage-style.xml:
- put <brackets> around email addresses
+ * apt-pkg/aptconfiguration.cc:
+ - parse dpkg --print-foreign-architectures correctly in
+ case archs are separated by newline instead of space, too.
+ (Closes: #655590)
* doc/po/de.po:
- apply typo-fix from Michael Basse, thanks! (LP: #900770)
* apt-pkg/acquire-item.cc:
@@ -915,8 +1293,8 @@ apt (0.8.15.10) unstable; urgency=high
* French: replace "étiquetage" by "épinglage" for "pinning"
[ Michael Vogt ]
- * merged patch from lp:~uusijani/apt/uusi-branch:
- Correct fi translation for hash sum mismatches (lp:420403)
+ * merged patch from lp:~uusijani/apt/uusi-branch:
+ Correct fi translation for hash sum mismatches (LP: #420403)
Thanks to Jani Uusitalo
-- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 14:14:26 +0100
@@ -1044,6 +1422,14 @@ apt (0.8.15.6) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 15 Aug 2011 09:20:35 +0200
+apt (0.8.15.5ubuntu1) oneiric; urgency=low
+
+ * apt-pkg/pkgcachegen.{cc,h}:
+ - fix crash when P.Arch() was used but the cache got remapped
+ (LP: #812862)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Aug 2011 15:18:50 +0200
+
apt (0.8.15.5) unstable; urgency=low
[ David Kalnischkies ]
@@ -1052,6 +1438,28 @@ apt (0.8.15.5) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 28 Jul 2011 16:49:15 +0200
+apt (0.8.15.4ubuntu2) oneiric; urgency=low
+
+ * apt-pkg/contrib/fileutl.{cc,h}:
+ - add GetModificationTime() helper
+ * apt-pkg/pkgcachegen.cc:
+ - regenerate the cache if the sources.list changes to ensure
+ that changes in the ordering there will be honored by apt
+ * apt-pkg/sourcelist.{cc,h}:
+ - add pkgSourceList::GetLastModifiedTime() helper
+ * apt-pkg/pkgcachegen.{cc,h}:
+ - use ref-to-ptr semantic in NewDepends() to ensure that the
+ libapt does not segfault if the cache is remapped in between
+ (LP: #812862)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 18:25:22 +0200
+
+apt (0.8.15.4ubuntu1) oneiric; urgency=low
+
+ * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jul 2011 13:19:49 +0200
+
apt (0.8.15.4) unstable; urgency=low
[ David Miller ]
@@ -1116,6 +1524,39 @@ apt (0.8.15.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 25 Jul 2011 15:04:43 +0200
+apt (0.8.15.2ubuntu2) oneiric; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix missing download progress in apt-get download
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Jul 2011 13:20:49 +0200
+
+apt (0.8.15.2ubuntu1) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.cc:
+ - improve error message for a expired Release file
+ * apt-pkg/algorithms.cc:
+ - Hold back packages that would enter "policy-broken" state on upgrade
+ when doing a "apt-get upgrade"
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - fallback to memory if file is not writeable even if access()
+ told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
+ * doc/sources.list.5.xml:
+ - document available [options] for sources.list entries (Closes: 632441)
+ * doc/apt.conf.5.xml:
+ - document APT::Architectures list (Closes: #612102)
+ * cmdline/apt-get.cc:
+ - restore all important dependencies for garbage packages (LP: #806274)
+ * apt-pkg/init.cc:
+ - use CndSet in pkgInitConfig (Closes: #629617)
+ * apt-pkg/depcache.cc:
+ - change default of APT::AutoRemove::SuggestsImportant to true
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Jul 2011 10:16:45 +0200
+
apt (0.8.15.2) unstable; urgency=high
* fix from David Kalnischkies for the InRelease gpg verification
@@ -1123,6 +1564,24 @@ apt (0.8.15.2) unstable; urgency=high
-- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200
+apt (0.8.15.1ubuntu2) oneiric; urgency=low
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not report errors encountered when decompressing packages
+
+ [ Michael Vogt ]
+ * fix from David Kalnischkies for the InRelease gpg verification
+ code (LP: #784473)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Jul 2011 14:42:02 +0200
+
+apt (0.8.15.1ubuntu1) oneiric; urgency=low
+
+ * merge from debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Jun 2011 09:16:12 +0100
+
apt (0.8.15.1) unstable; urgency=low
[ David Kalnischkies ]
@@ -1146,6 +1605,17 @@ apt (0.8.15.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 30 Jun 2011 10:05:36 +0200
+apt (0.8.15ubuntu1) oneiric; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Jun 2011 09:03:39 +0100
+
apt (0.8.15) unstable; urgency=low
[ Julian Andres Klode ]
@@ -1434,6 +1904,101 @@ apt (0.8.14.2) UNRELEASED; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200
+apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.changelog:
+ - add missing ";", thanks to Julian Andres Klode
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - updated allocate memory string
+ - cannot access archive string is lowercase
+ * apt-pkg/deb/dpkgpm.cc:
+ - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
+ attachments
+
+ -- Brian Murray <brian@ubuntu.com> Wed, 15 Jun 2011 14:00:43 -0700
+
+apt (0.8.14.1ubuntu7) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/deblistparser.cc:
+ - include all known languages when building the apt cache
+ (LP: #794907)
+ * apt-pkg/deb/debindexfile.cc:
+ - remove some no longer valid checks for "TranslationsAvailable()"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Jun 2011 13:56:25 +0200
+
+apt (0.8.14.1ubuntu6) oneiric; urgency=low
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - prevent reporting of package installation failures due to inaccessible
+ local files (LP: #791102, #790040)
+ - include /var/log/apt/history.log in apport-package reports so we know
+ the context for the package management request
+
+ [ Michael Vogt ]
+ * methods/mirror.cc:
+ - ignore lines starting with "#" in the mirror file
+ - ignore non http urls in the mirrors
+ - append the dist (e.g. sid, wheezy) as a query string when
+ asking for a suitable mirror
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Jun 2011 15:55:07 +0200
+
+apt (0.8.14.1ubuntu5) oneiric; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - do not reject empty Packages files when checking them for
+ correctness
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 May 2011 10:41:30 +0200
+
+apt (0.8.14.1ubuntu4) oneiric; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/acquire-item.cc:
+ - Reject files known to be invalid (LP: #346386) (Closes: #627642)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 May 2011 17:12:27 +0200
+
+apt (0.8.14.1ubuntu3) oneiric; urgency=low
+
+ * Rebuild with recent binutils. LP: #774175.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 23 May 2011 19:15:34 +0200
+
+apt (0.8.14.1ubuntu2) oneiric; urgency=low
+
+ * debian/rules:
+ - build in verbose mode by default (thanks to Matthias Klose)
+ * debian/control:
+ - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 May 2011 13:58:10 +0200
+
+apt (0.8.14.1ubuntu1) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * merged from the debian-sid bzr branch
+
+ [ Julian Andres Klode ]
+ * apt-pkg/depcache.cc:
+ - Really release action groups only once (Closes: #622744)
+ - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+ * debian/apt.cron.daily:
+ - Check power after wait, patch by manuel-soto (LP: #705269)
+ * debian/control:
+ - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+ unpacked if a library is too old and thus break upgrades
+ * doc/apt-key.8.xml:
+ - Document apt-key net-update (LP: #192810)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Apr 2011 17:55:20 +0200
+
apt (0.8.14.1) unstable; urgency=low
* apt-pkg/acquire-item.cc:
@@ -1476,6 +2041,42 @@ apt (0.8.14) unstable; urgency=low
-- Julian Andres Klode <jak@debian.org> Fri, 15 Apr 2011 14:28:15 +0200
+apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - stop reporting of apport-package bug reports regarding
+ dpkg I/O errors (LP: #767776)
+
+ -- Brian Murray <brian@ubuntu.com> Wed, 20 Apr 2011 15:05:12 -0700
+
+apt (0.8.13.2ubuntu2) natty; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - run unattended-upgrades even if there was a error during
+ the apt-get update (LP: #676295)
+
+ [ Julian Andres Klode ]
+ * apt-pkg/indexcopy.cc:
+ - Use RealFileExists() instead of FileExists(), allows amongst other
+ things a directory named Sources to exist on a CD-ROM (LP: #750694).
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcache.cc:
+ - use the native Architecture stored in the cache header instead of
+ loading it from configuration as suggested by Julian Andres Klode
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Apr 2011 12:52:21 +0200
+
+apt (0.8.13.2ubuntu1) natty; urgency=low
+
+ * merge fixes from debian-sid, most notable the handling of
+ arch=all architectures in python-apt (LP: #733741)
+ * apt-pkg/aptconfiguration.cc:
+ - fix comparing for a empty string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 13:19:56 +0200
+
apt (0.8.13.2) unstable; urgency=low
[ David Kalnischkies ]
@@ -1512,6 +2113,12 @@ apt (0.8.13.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200
+apt (0.8.13.1ubuntu1) natty; urgency=low
+
+ * merged fixes from the debian-sid (LP: #744832)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Apr 2011 14:40:51 +0200
+
apt (0.8.13.1) unstable; urgency=low
* apt-pkg/acquire-item.cc: Use stat buffer if stat was
@@ -1519,6 +2126,24 @@ apt (0.8.13.1) unstable; urgency=low
-- Julian Andres Klode <jak@debian.org> Sat, 02 Apr 2011 20:55:35 +0200
+apt (0.8.13ubuntu2) natty; urgency=low
+
+ * po/makefile:
+ - add hack to run MSGMERGE again if it segfaults. this is to help
+ powerpc to bootstrap
+ * mirror method:
+ - merge fix from Matt Zimmerman, many thanks (LP: #741098)
+ - do not crash if the mirror file fails to download
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Mar 2011 18:01:38 +0100
+
+apt (0.8.13ubuntu1) natty; urgency=low
+
+ * merged from debian/sid, this adds important fixes in the
+ apt mirror method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100
+
apt (0.8.13) unstable; urgency=low
[ Thorsten Spindler ]
@@ -1540,6 +2165,29 @@ apt (0.8.13) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100
+apt (0.8.12ubuntu2) unstable; urgency=low
+
+ [ Thorsten Spindler ]
+ * methods/rsh.cc
+ - fix rsh/ssh option parsing (LP: #678080), thanks to
+ Ville Mattila
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.cc:
+ - mark pkgAcqIndexTrans as Index-File to avoid asking the
+ user to insert the CD on each apt-get update
+ * methods/mirror.cc:
+ - improve debug output and fix bug in TryNextMirror
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100
+
+apt (0.8.12ubuntu1) natty; urgency=low
+
+ * merged from debian/sid, this adds important fixes in the udev based
+ cdrom handling and multiarch handling
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 16:12:22 +0100
+
apt (0.8.12) unstable; urgency=low
[ Michael Vogt ]
@@ -1593,6 +2241,23 @@ apt (0.8.12) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 10 Mar 2011 14:46:48 +0100
+apt (0.8.11.5ubuntu2) natty; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/debindexfile.cc:
+ - ignore missing deb-src files in /var/lib/apt/lists, thanks
+ to Thorsten Spindler (LP: #85590)
+ * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
+ - honor Dpkg::Chroot-Directory in the RunScripts*() methods
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Mar 2011 17:39:30 +0100
+
+apt (0.8.11.5ubuntu1) natty; urgency=low
+
+ * Merged from debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Feb 2011 12:01:19 +0100
+
apt (0.8.11.5) unstable; urgency=low
[ Christian Perrier ]
@@ -1824,6 +2489,27 @@ apt (0.8.10.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 17 Jan 2011 13:41:04 +0100
+apt (0.8.10ubuntu2) UNRELEASED; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - ignore lzma "Cannot allocate memory" errors, thanks to Brian
+ Murray
+ - add i18n support for the "short read in buffer_copy %s" handling
+ from dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Jan 2011 18:26:05 +0100
+
+apt (0.8.10ubuntu1) natty; urgency=low
+
+ [ Julian Andres Klode ]
+ * cmdline/apt-cache.cc: Create an error for apt-cache depends
+ if packages could not found (LP: #647045)
+
+ [ Michael Vogt ]
+ * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Dec 2010 15:53:49 +0100
+
apt (0.8.10) unstable; urgency=low
[ Programs translations ]
@@ -1843,6 +2529,48 @@ apt (0.8.10) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 30 Nov 2010 10:42:17 +0100
+apt (0.8.9ubuntu4) natty; urgency=low
+
+ [ Michael Vogt ]
+ * cmdline/apt-key:
+ - set timeout of wget for net-update to 90 seconds (thanks to \sh)
+
+ [ Martin Pitt ]
+ * Revert r1819 and r1820 to disable compressed indexes by default again.
+ Testing has brought up a few places where this seriously degrades
+ performance, mostly in applications which iterate through all available
+ package records, like update-apt-xapian-index or synaptic. See
+ https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Nov 2010 08:50:37 +0100
+
+apt (0.8.9ubuntu3) natty; urgency=low
+
+ * methods/http.cc:
+ - do not hang if Acquire::http::ProxyAutoDetect can not be
+ executed or returns no data (LP: #654393)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Nov 2010 10:42:50 +0100
+
+apt (0.8.9ubuntu2) natty; urgency=low
+
+ * drop apt-changelog, apt-get changelog implements all the
+ features it provides
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:22:40 +0100
+
+apt (0.8.9ubuntu1) natty; urgency=low
+
+ * re-merged from the debian-sid bzr branch
+ * merged lp:~mvo/apt/mvo, this brings two new commands:
+ - apt-get download binary-pkgname to download a deb
+ - apt-get changelog binary-pkgname to display the changelog
+ * cmdline/apt-get.cc:
+ - if the changelog download failed, do not show the generic error
+ but point to launchpad instead
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:02:14 +0100
+
apt (0.8.9) unstable; urgency=low
[ Christian Perrier ]
@@ -1874,6 +2602,47 @@ apt (0.8.9) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 18 Nov 2010 09:25:04 +0100
+apt (0.8.8ubuntu3) natty; urgency=low
+
+ * cmdline/apt-changelog: Filter out multiple results for a source package,
+ just take the latest one.
+ * cmdline/apt-changelog: Read server name from configuration
+ APT::Changelog::Server instead of hardcoding it. This allows local users
+ to point to a local changelog mirror, or make this script work for Debian.
+ * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
+ server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
+ * doc/apt-changelog.1.xml: Document the new option.
+ * test/integration/test-compressed-indexes, test/test-indexes.sh:
+ - Explicitly disable compressed indexes at the start. This ensures that we
+ will actually test uncompressed indexes regardless of the internal
+ default value of Acquire::GzipIndexes.
+ * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
+ store compressed indexes. This feature is now mature enough for general
+ consumption. Update doc/apt.conf.5.xml accordingly.
+ * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
+ to preferring "gz", so that compressed indexes will actually work.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Nov 2010 12:14:15 +0100
+
+apt (0.8.8ubuntu2) natty; urgency=low
+
+ * Add cmdline/apt-changelog: Script to fetch package changelog from
+ changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
+ * Add doc/apt-changelog.1.xml, and install it in debian/rules.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 09 Nov 2010 11:32:27 +0100
+
+apt (0.8.8ubuntu1) natty; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Oct 2010 10:07:09 -0400
+
apt (0.8.8) unstable; urgency=low
[ David Kalnischkies ]
@@ -1893,6 +2662,17 @@ apt (0.8.8) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 28 Oct 2010 21:22:21 +0200
+apt (0.8.7ubuntu1) natty; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Oct 2010 18:31:17 +0200
+
apt (0.8.7) unstable; urgency=low
[ Manpages translations ]
@@ -2011,6 +2791,92 @@ apt (0.8.4) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 10 Sep 2010 20:45:15 +0200
+apt (0.8.3ubuntu7) maverick; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - do not remove packages which the user requested for installation
+ explicitly while satisfying other install requests (Closes: #598669)
+ Test case: debootstrap, install exim4, run "apt-get install postfix"
+ This will result in exim4-heavy instead of postfix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Oct 2010 14:13:38 +0200
+
+apt (0.8.3ubuntu6) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - source /etc/default/locale (if available) so that the
+ apt-get update cron job fetches the right translated package
+ descriptions (LP: #652951)
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - do not check endpointer packages instead of only those which prevented
+ NeverAutoRemove settings from having an effect (Closes: #598452)
+ * cmdline/apt-cache.cc:
+ - use the TranslatedDescription for searching and not the first
+ available one as it is maybe not an expected language (Closes: #597925)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Oct 2010 15:25:00 +0200
+
+apt (0.8.3ubuntu5) maverick; urgency=low
+
+ * debian/apt.dirs:
+ - add missing /usr/share/apt so that the keyring is installed
+ into the right place (LP: #620576)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 22 Sep 2010 18:34:18 +0200
+
+apt (0.8.3ubuntu4) maverick; urgency=low
+
+ * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
+ with conflicts/breaks against virtual packages (LP: #614993)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:48:26 +0200
+
+apt (0.8.3ubuntu3) maverick; urgency=low
+
+ * merged fixes from debian-sid
+
+ [ Michael Vogt ]
+ * apt-pkg/contrib/cdromutl.cc:
+ - if apt-cdrom is used on writable media (like usb-sticks), do
+ not use the root directory to identify the medium (as all
+ changes there change the ident id). Use the .disk directory
+ instead
+
+ [ David Kalnischkies ]
+ * ftparchive/writer.cc:
+ - null the valid string instead of the date if Valid-Until is not set
+ * apt-pkg/acquire-item.cc:
+ - use also unsigned Release files again (Closes: #596189)
+
+ [ Christian Perrier ]
+ * Fix missing space after dot in a message from apt-pkg
+ Translations unfuzzied. Thanks to Holger Wansing.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Sep 2010 21:45:49 +0200
+
+apt (0.8.3ubuntu2) maverick; urgency=low
+
+ * ftparchive/writer.cc:
+ - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
+ available LP: #633967. Thanks to Colin Watson
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200
+
+apt (0.8.3ubuntu1) maverick; urgency=low
+
+ * merged fixes from debian-sid
+ * debian/rules:
+ - put ubuntu-archive.gpg back into the package (LP: #620576)
+ * apt-pkg/init.cc:
+ - ignore ".distUpgrade" and ".save" files in sources.list.d
+ (LP: #631770)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200
+
apt (0.8.3) unstable; urgency=low
[ Programs translations ]
@@ -2103,6 +2969,69 @@ apt (0.8.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200
+apt (0.8.0ubuntu3) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Simplified Chinese (Aron Xu). Closes: #594458
+ * Bulgarian (Damyan Ivanov). Closes: #594627
+ * Portuguese (Miguel Figueiredo). Closes: #594668
+ * Korean (Changwoo Ryu). Closes: #594809
+
+ [ Manpages translations ]
+ * Portuguese (Américo Monteiro)
+
+ [ David Kalnischkies ]
+ * cmdline/apt-cache.cc:
+ - remove useless GetInitialize method
+ * cmdline/apt-get.cc:
+ - remove direct calls of ReadMainList and use the wrapper instead
+ to protect us from useless re-reads and two-times notice display
+ - remove death code by removing unused GetInitialize
+ * apt-pkg/depcache.cc:
+ - now that apt-get purge works on 'rc' packages let the MarkDelete
+ pass this purge forward to the non-pseudo package for pseudos
+ * apt-pkg/contrib/fileutl.cc:
+ - apply SilentlyIgnore also on files without an extension
+ * apt-pkg/contrib/configuration.cc:
+ - fix autoremove by using correct config-option name and
+ don't make faulty assumptions in error handling (Closes: #594689)
+ * apt-pkg/versionmatch.cc:
+ - let the pin origin actually work as advertised in the manpage
+ which means "" are optional and pinning a local archive does
+ work - even if it is a non-flat archive (Closes: #594435)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 17:05:53 +0200
+
+apt (0.8.0ubuntu2) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Thai (Theppitak Karoonboonyanan). Closes: #592695
+ * Russian (Yuri Kozlov). Closes: #594232
+ * Slovak (Ivan Masár). Closes: #594255
+ * Swedish (Daniel Nylander). Closes: #594241
+ * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
+ * Italian (Milo Casagrande). Closes: #594238
+ * Asturian (maacub). Closes: #594303
+
+ [ Christian Perrier ]
+ * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
+ Closes: #594211
+
+ [ David Kalnischkies ]
+ * show in madison command again also source packages (LP: #614589)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Aug 2010 18:56:23 +0200
+
+apt (0.8.0ubuntu1) maverick; urgency=low
+
+ * merged from debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200
+
apt (0.8.0) unstable; urgency=low
[ Michael Vogt ]
@@ -2145,6 +3074,20 @@ apt (0.8.0~pre2) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 23 Aug 2010 19:09:08 +0200
+apt (0.8.0~pre1ubuntu2) maverick; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - enable apport reports again (got lost in the previous merge),
+ thanks to Matt Zimmerman
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Aug 2010 13:53:09 +0200
+
+apt (0.8.0~pre1ubuntu1) maverick; urgency=low
+
+ * merged fixes from debian/experimental
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 17:49:40 +0200
+
apt (0.8.0~pre1) experimental; urgency=low
[ Programs translations ]
@@ -2187,6 +3130,56 @@ apt (0.8.0~pre1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 13 Aug 2010 17:00:49 +0200
+apt (0.7.26~exp12ubuntu4) maverick; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/contrib/fileutl.cc:
+ - Add WriteAtomic mode.
+ - Revert WriteEmpty to old behavior (LP: #613211)
+ * apt-pkg, methods:
+ - Convert users of WriteEmpty to WriteAtomic.
+ * apt-pkg/depcache.cc:
+ - Only try upgrade for Breaks if there is a newer version, otherwise
+ handle it as Conflicts (by removing it) (helps for #591882).
+
+ [ Michael Vogt ]
+ * debian/control:
+ - Add recommends on gnupg to apt, apt-key uses it.
+ (changed from debian)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Aug 2010 12:01:30 +0200
+
+apt (0.7.26~exp12ubuntu3) maverick; urgency=low
+
+ [ Colin Watson ]
+ * apt-pkg/cdrom.cc:
+ - fix off-by-one error in DropBinaryArch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200
+
+apt (0.7.26~exp12ubuntu2) maverick; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if ubuntu-keyring is not installed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200
+
+apt (0.7.26~exp12ubuntu1) maverick; urgency=low
+
+ * ABI break upload
+ * merged from debian/experimental, remaining changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+ * debian/apt.postinst
+ - drop set_apt_proxy_from_gconf(), no longer needed in maverick
+ * apt-pkg/pkgcache.cc:
+ - re-evaluate the architectures cache when the cache is (re)opened
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200
+
apt (0.7.26~exp12) experimental; urgency=low
[ Michael Vogt ]
@@ -2801,6 +3794,152 @@ apt (0.7.26~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100
+apt (0.7.25.3ubuntu10) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.ubuntu:
+ - no longer install (empty) apt.conf.d/01ubuntu
+ * apt-pkg/deb/dpkgpm.cc:
+ - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
+ - fix FTBFS (LP: #600155)
+
+ [ Matthias G. ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Jul 2010 09:37:03 +0200
+
+apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if getent returns nothing useful (LP: #579647)
+ thanks to Jean-Baptiste Lallement
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200
+
+apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
+
+ [ Loïc Minier ]
+ * Use https:// in Vcs-Bzr URL.
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/debrecords.cc:
+ - fix max tag buffer size (LP: #545336, closes: #578959)
+ * apt-pkg/indexfile.cc:
+ - If no "_" is found in the language code, try to find a "."
+ This is required for languages like Esperanto that have no
+ county associated with them (LP: #560956)
+ Thanks to "Aisano" for the fix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200
+
+apt (0.7.25.3ubuntu7) lucid; urgency=low
+
+ Cherry pick fixes from the lp:~mvo/apt/mvo branch:
+
+ [ Evan Dandrea ]
+ * Remember hosts with general failures for
+ https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+
+ [ Michael Vogt ]
+ * improve debug output for Debug::pkgPackageManager
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200
+
+apt (0.7.25.3ubuntu6) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix crash when pkg.VersionList() is empty (LP: #556056)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200
+
+apt (0.7.25.3ubuntu5) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - try version match in FindSrc first exact than fuzzy (LP: #551178)
+
+ [ Jean-Baptiste Lallement ]
+ * apt-pkg/contrib/strutl.cc:
+ - always escape '%' (LP: #130289) (Closes: #500560)
+ - unescape '%' sequence only if followed by 2 hex digit
+ - username/password are urlencoded in proxy string (RFC 3986)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200
+
+apt (0.7.25.3ubuntu4) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/debversion.cc:
+ - consider absent of debian revision equivalent to 0 (Closes: #573592)
+ LP: #540228
+ * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
+ - fix memory leaks in error conditions in DoSource()
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix error message construction in OpenLog()
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Mar 2010 16:57:49 +0100
+
+apt (0.7.25.3ubuntu3) lucid; urgency=low
+
+ * apt-pkg/indexfile.cc:
+ - remove "cs" from languages that need the full langcode when
+ downloading translations (thanks to Steve Langasek)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Mar 2010 09:42:39 +0100
+
+apt (0.7.25.3ubuntu2) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * abicheck/
+ - add new abitest tester using the ABI Compliance Checker from
+ http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
+ * debian/apt.conf.autoremove:
+ - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
+ for transitional packages
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix backgrounding when dpkg runs (closes: #486222)
+ * cmdline/apt-mark:
+ - show error on incorrect aguments (LP: #517917), thanks to
+ Torsten Spindler
+ * cmdline/apt-get.cc:
+ - if apt-get source foo=version or foo/distro can not be found,
+ error out (LP: #502641)
+ * apt-pkg/indexfile.cc:
+ - deal correctly with three letter langcodes (LP: #391409)
+ * debian/apt.cron.daily:
+ - do not look into admin users gconf anymore for the http proxy
+ the user now needs to use the "Apply system-wide" UI in the
+ gnome-control-center to set it
+ * debian/apt.postinst:
+ - add set_apt_proxy_from_gconf() and run that once on upgrade if
+ there is no proxy configured already system-wide (LP: #432631)
+ From that point on gnome-control-center will have to warn if
+ the user makes changes to the proxy settings and does not apply
+ them system wide
+
+ [ Robert Collins ]
+ * Change the package index Info methods to allow apt-cache policy to be
+ useful when using several different archives on the same host.
+ (Closes: #329814, LP: #22354)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Mar 2010 23:10:52 +0100
+
+apt (0.7.25.3ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * merged with the debian-sid branch
+ * methods/http.cc:
+ - add Acquire::http::ProxyAutoDetect configuration that
+ can be used to call a external helper to figure out the
+ proxy configuration and return it to apt via stdout
+ (this is a step towards WPAD and zeroconf/avahi support)
+
+ [ Ivan Masár ]
+ * Slovak translation update. Closes: #568294
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Feb 2010 23:33:32 +0100
+
apt (0.7.25.3) unstable; urgency=low
[ Christian Perrier ]
@@ -2921,6 +4060,39 @@ apt (0.7.25.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sat, 09 Jan 2010 21:52:36 +0100
+apt (0.7.25ubuntu4) lucid; urgency=low
+
+ * cmdline/apt-cdrom.cc:
+ - make Acquire::cdrom::AutoDetect default, this can be
+ turned off with "--no-auto-detect"
+ * methods/http.cc:
+ - add cache-control headers even if no cache is given to allow
+ adding options for intercepting proxies
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Feb 2010 16:58:59 -0800
+
+apt (0.7.25ubuntu3) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - don't mark as manually if in download only (Closes: #468180)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100
+
+apt (0.7.25ubuntu2) lucid; urgency=low
+
+ * Change history branch so that it does not break the
+ apt ABI for the pkgPackageManager interface
+ (can be reverted on the next ABI break)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 10:14:16 +0100
+
+apt (0.7.25ubuntu1) lucid; urgency=low
+
+ * Merged from the mvo branch
+ * merged from the lp:~mvo/apt/history branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100
+
apt (0.7.25) unstable; urgency=low
[ Christian Perrier ]
@@ -3064,6 +4236,29 @@ apt (0.7.25) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100
+apt (0.7.24ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - include df -l output in the apport log as well (thanks to
+ tjaalton)
+ * apt-pkg/packagemanager.cc:
+ - add output about pre-depends configuring when debug::pkgPackageManager
+ is used
+ * methods/https.cc:
+ - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
+ thanks to Brian Thomason for the patch
+ * merge lp:~mvo/apt/netrc branch, this adds support for a
+ /etc/apt/auth.conf that can be used to store username/passwords
+ in a "netrc" style file (with the extension that it supports "/"
+ in a machine definition). Based on the maemo git branch.
+
+ [ Brian Murray ]
+ * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+ - typo fix (LP: #462328)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Dec 2009 09:27:26 +0100
+
apt (0.7.24) unstable; urgency=low
[ Nicolas François ]
@@ -3133,6 +4328,59 @@ apt (0.7.24) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200
+apt (0.7.23.1ubuntu2) karmic; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - fix Vcr-Bzr header
+
+ [ Kees Cook ]
+ * debian/apt.cron.daily:
+ - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200
+
+apt (0.7.23.1ubuntu1) karmic; urgency=low
+
+ [ Matt Zimmerman ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Suppress apport reports on dpkg short reads (these I/O errors are not
+ generally indicative of a bug in the packaging)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
+
+ [ Brian Murray ]
+ * cmdline/apt-get.cc:
+ - typo fix (LP: #370094)
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - when tcgetattr() returns non-zero skip all pty magic
+ (thanks to Simon Richter, closes: #509866)
+ * apt-inst/contrib/arfile.cc:
+ - show propper error message for Invalid archive members
+ * apt-pkg/acquire-worker.cc:
+ - show error details of failed methods
+ * apt-pkg/contrib/fileutl.cc:
+ - if a process aborts with signal, show signal number
+ * methods/http.cc:
+ - ignore SIGPIPE, we deal with EPIPE from write in
+ HttpMethod::ServerDie() (LP: #385144)
+ * debian/apt.cron.daily:
+ - if the timestamp is too far in the future, delete it
+ (LP: #135262)
+
+ [ Merge ]
+ * merged from debian, reverted the libdlopen-udev branch
+ because its too late in the release process for this now
+ * not merged the proxy behaviour change from 0.7.23 (that will
+ be part of lucid)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200
+
apt (0.7.23.1) unstable; urgency=low
[ Michael Vogt ]
@@ -3362,6 +4610,34 @@ apt (0.7.22) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200
+apt (0.7.21ubuntu1) karmic; urgency=low
+
+ * merged from the debian-sid bzr branch
+
+ [ Christian Perrier ]
+ * Documentation translations:
+ - Fix a typo in apt-get(8) French translation. Closes: #525043
+ Thanks to Guillaume Delacour for spotting it.
+ * Translations:
+ - fr.po
+ - sk.po. Closes: #525857
+ - ru.po. Closes: #526816
+ - eu.po. Closes: #528985
+ - zh_CN.po. Closes: #531390
+ - fr.po
+ - it.po. Closes: #531758
+ - ca.po. Closes: #531921
+ * Added translations
+ - ast.po (Asturian by Marcos Alvareez Costales).
+ Closes: #529007, #529730
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire.cc:
+ - make the (internal) max pipeline depth of the acquire queue
+ configurable via Acquire::Max-Pipeline-Depth
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200
+
apt (0.7.21) unstable; urgency=low
[ Christian Perrier ]
@@ -3405,6 +4681,125 @@ apt (0.7.21) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200
+apt (0.7.20.2ubuntu7) karmic; urgency=low
+
+ * fix problematic use of tolower() when calculating the version
+ hash by using locale independant tolower_ascii() function.
+ Thanks to M. Vefa Bicakci (LP: #80248)
+ * build fixes for g++-4.4
+ * include dmesg output in apport package failures
+ * include apt ordering into apport package failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Apr 2009 10:14:01 +0200
+
+apt (0.7.20.2ubuntu6) jaunty; urgency=low
+
+ [ Jamie Strandboge ]
+ * apt.cron.daily: catch invalid dates due to DST time changes
+ in the stamp files (LP: #354793)
+
+ [ Michael Vogt ]
+ * methods/gpgv.cc:
+ - properly check for expired and revoked keys (closes: #433091)
+ LP: #356012
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Apr 2009 22:39:50 +0200
+
+apt (0.7.20.2ubuntu5) jaunty; urgency=low
+
+ [ Colin Watson ]
+ * cmdline/acqprogress.cc:
+ - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
+ dlstatus messages on the status-fd (LP: #290234).
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - do not clutter cron mail with bogus gconftool messages
+ (LP: #223502)
+ - merge fix for cache locking from debian (closes: #459344)
+ - run update-apt-xapian-index (with ionice) to ensure that
+ the index is up-to-date when synaptic is run (LP: #288797)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200
+
+apt (0.7.20.2ubuntu4) jaunty; urgency=low
+
+ * ftparchive/cachedb.cc:
+ - when apt-ftparchive clean is used, compact the database
+ at the end (thanks to cprov)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Mar 2009 13:43:59 +0100
+
+apt (0.7.20.2ubuntu3) jaunty; urgency=low
+
+ * methods/mirror.cc:
+ - when download the mirror file and the server is down,
+ return a propper error message (LP: #278635)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Mar 2009 15:42:15 +0100
+
+apt (0.7.20.2ubuntu2) jaunty; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - revert termios patch (LP: #338514)
+ * cmdline/apt-get.cc
+ - fix "apt-get source pkg" if there is a binary package and
+ a source package of the same name but from different
+ packages (LP: #330103)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Mar 2009 16:33:28 +0100
+
+apt (0.7.20.2ubuntu1) jaunty; urgency=low
+
+ [ Christian Perrier ]
+ * Translations:
+ - bg.po. Closes: #513211
+ - zh_TW.po. Closes: #513311
+ - nb.po. Closes: #513843
+
+ [ Michael Vogt ]
+ * merged from the debian-sid branch
+ * [ABI break] merge support for http redirects, thanks to
+ Jeff Licquia and Anthony Towns
+ * [ABI break] use int for the package IDs (thanks to Steve Cotton)
+ * apt-pkg/contrib/strutl.cc:
+ - fix TimeToStr i18n (LP: #289807)
+ * debian/apt.conf.autoremove:
+ - readd "linux-image" (and friends) to the auto-remove
+ blacklist
+ * fix some i18n issues (thanks to Gabor Kelemen)
+ LP: #263089
+ * apt-pkg/deb/dpkgpm.cc:
+ - filter "ENOMEM" errors when creating apport reports
+ * cmdline/apt-get.cc:
+ - fix "apt-get source pkg=ver" if binary name != source name
+ (LP: #202219)
+ * apt-pkg/indexrecords.cc:
+ - fix some i18n issues
+ * apt-pkg/contrib/strutl.h:
+ - add new strprintf() function to make i18n strings easier
+ * apt-pkg/dev/debsystem.cc:
+ - add missing apti18n.h header
+ * cmdline/apt-get.cc:
+ - default to "false" for the "APT::Get::Build-Dep-Automatic"
+ option (follow debian here)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
+ * methods/https.cc:
+ - add Acquire::https::AllowRedirect support
+ - do not unlink files in partial/ (thanks to robbiew)
+
+ [ Dereck Wonnacott ]
+ * Clarify the --help for 'purge' (LP: #243948)
+
+ [ Ian Weisser ]
+ * /apt-pkg/deb/debsystem.cc:
+ - add 'sudo' to the error message to "run 'dpkg --configure -a'"
+ (LP: #52697)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100
+
apt (0.7.20.2) unstable; urgency=medium
[ Eugene V. Lyubimkin ]
@@ -3473,6 +4868,12 @@ apt (0.7.20) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100
+apt (0.7.19ubuntu1) jaunty; urgency=low
+
+ * merge from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +0100
+
apt (0.7.19) unstable; urgency=low
[ Eugene V. Lyubimkin ]
@@ -3771,6 +5172,90 @@ apt (0.7.15~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200
+apt (0.7.14ubuntu7) jaunty; urgency=low
+
+ * cmdline/apt-cache.cc:
+ - remove the gettext from a string that consists entirely
+ of variables (LP: #56792)
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix potential hang when in a backgroud process group
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2008 21:09:12 +0100
+
+apt (0.7.14ubuntu6) intrepid; urgency=low
+
+ * debian/apt.conf.autoremove:
+ - remove "linux-image" (and friends) from the auto-remove
+ blacklist. we have the kernel fallback infrastructure now
+ in intrepid (thanks to BenC)
+ * apt-pkg/indexcopy.cc:
+ - support having CDs with no Packages file (just a Packages.gz)
+ by not forcing a verification on non-existing files
+ (LP: #255545)
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve the filtering for duplicated apport reports (thanks
+ to seb128 for pointing that problem out)
+ - do not report disk full errors from dpkg via apport
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Aug 2008 16:28:05 +0200
+
+apt (0.7.14ubuntu5) intrepid; urgency=low
+
+ * fix various -Wall warnings
+ * make "apt-get build-dep" installed packages marked automatic
+ by default. This can be changed by setting the value of
+ APT::Get::Build-Dep-Automatic to false (thanks to Aaron
+ Haviland, closes: #44874, LP: #248268)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Aug 2008 14:00:51 +0200
+
+apt (0.7.14ubuntu4) intrepid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix uninitialized variable that caused no apport reports
+ to be written sometimes (thanks to Matt Zimmerman)
+ * merge patch that enforces stricter https server certificate
+ checking (thanks to Arnaud Ebalard, closes: #485960)
+ * allow per-mirror specific https settings
+ (thanks to Arnaud Ebalard, closes: #485965)
+ * add doc/examples/apt-https-method-example.cof
+ (thanks to Arnaud Ebalard, closes: #485964)
+ * add DPkg::NoTriggers option so that applications that call
+ apt/aptitude (like the installer) defer trigger processing
+ (thanks to Joey Hess)
+ * document --install-recommends and --no-install-recommends
+ (thanks to Dereck Wonnacott, LP: #126180)
+
+ [ Dereck Wonnacott ]
+ * apt-ftparchive might write corrupt Release files (LP: #46439)
+ * Apply --important option to apt-cache depends (LP: #16947)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Aug 2008 10:10:49 +0200
+
+apt (0.7.14ubuntu3) intrepid; urgency=low
+
+ [ Otavio Salvador ]
+ * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
+ Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
+ * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve apt progress reporting, display trigger actions
+ * apt-pkg/depcache.cc:
+ - when checking for new important deps, skip critical ones
+ (LP: #236360)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 Jun 2008 17:27:07 +0200
+
+apt (0.7.14ubuntu2) intrepid; urgency=low
+
+ * debian/control:
+ - fix FTBFS by adding missing intltool dependency
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 09 May 2008 13:50:22 +0200
+
apt (0.7.14) unstable; urgency=low
[ Christian Perrier ]
@@ -3997,6 +5482,268 @@ apt (0.7.10) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 07 Jan 2008 21:40:47 +0100
+apt (0.7.9ubuntu17) hardy-proposed; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix signaure removal on transient network failures LP: #220627
+ (thanks to Scott James Remnant)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Apr 2008 16:32:49 +0200
+
+apt (0.7.9ubuntu16) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - only check against master-keys in net-update to not break
+ custom CDs (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200
+
+apt (0.7.9ubuntu15) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - do two passes when installing tasks, first ignoring dependencies,
+ then resolving them and run the problemResolver at the end
+ so that it can correct any missing dependencies. This should
+ fix livecd building for kubuntu (thanks to Jonathan Riddell
+ for reporting the problem)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Mar 2008 23:25:45 +0100
+
+apt (0.7.9ubuntu14) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix incorrect help output for -f (LP: #57487)
+ - run the problemResolver after a task was installed
+ so that it can correct any missing dependencies
+ * typo fixes (LP: #107960)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Mar 2008 21:46:07 +0100
+
+apt (0.7.9ubuntu13) hardy; urgency=low
+
+ [ Lionel Porcheron ]
+ * debian/apt.cron.daily:
+ - only call gconftool if gcontool is installed (LP: #194281)
+
+ [ Michael Vogt ]
+ * doc/apt_preferences.5.xml:
+ - fix typo (LP: #150900)
+ * doc/example/sources.list:
+ - updated for hardy (LP: #195879)
+ * debian/apt.cron.daily:
+ - sleep random amount of time (default within 0-30min) before
+ starting the upate to hit the mirrors less hard
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Mar 2008 15:35:09 +0100
+
+apt (0.7.9ubuntu12) hardy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use admin user proxy settings
+ * cmdline/apt-get.cc:
+ - fix task installation (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100
+
+apt (0.7.9ubuntu11) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ (LP: #188127)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100
+
+apt (0.7.9ubuntu10) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add "net-update" command that fetches the
+ ubuntu-archive-keyring.gpg and add keys from it that are
+ signed by the ubuntu-master-keyring.gpg
+ (apt-archive-key-signatures spec)
+ * debian/apt.cron.daily:
+ - add apt-key net-update to the nightly cron job
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Feb 2008 15:50:28 +0100
+
+apt (0.7.9ubuntu9) hardy; urgency=low
+
+ * fix FTBFS due to incorrect intltool build-depends
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 16:04:37 +0100
+
+apt (0.7.9ubuntu8) hardy; urgency=low
+
+ * share/apt-auth-failure.note:
+ - show update-notifier note if the nightly update fails with a
+ authentication failure (apt-authentication-reliability spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100
+
+apt (0.7.9ubuntu7) hardy; urgency=low
+
+ * methods/connect.cc:
+ - remember hosts with Resolve failures or connect Timeouts
+ see https://wiki.ubuntu.com/NetworklessInstallationFixes
+ * cmdlines/apt-key:
+ - fix bug in the new apt-key update code that imports only
+ keys signed with the master key (thanks to cjwatson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Feb 2008 11:38:35 +0100
+
+apt (0.7.9ubuntu6) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add support for a master-keyring that contains signing keys
+ that can be used to sign the archive signing keys. This should
+ make key-rollover easier.
+ * apt-pkg/deb/dpkgpm.cc:
+ - merged patch from Kees Cook to fix anoying upper-case display
+ on amd64 in sbuild
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ - Make the breaks handling use the kill list. This means, that a
+ Breaks: Pkg (<< version) may put Pkg onto the remove list.
+ * apt-pkg/deb/dpkgpm.cc:
+ - add APT::Apport::MaxReports to limit the maximum number
+ of reports generated in a single run (default to 3)
+ * apt-pkg/deb/debmetaindex.cc:
+ - add missing "Release" file uri when apt-get update --print-uris
+ is run
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Feb 2008 14:28:02 +0100
+
+apt (0.7.9ubuntu5) hardy; urgency=low
+
+ * Merged apt-authentication-reliabilty branch. This means
+ that apt will refuse to update and use the old lists if
+ the authentication of a repository that used to be
+ authenticated fails. See
+ https://wiki.ubuntu.com/AptAuthenticationReliability
+ for more details.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jan 2008 10:36:10 +0100
+
+apt (0.7.9ubuntu4) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
+ true, the effect of the compatibility code was to require both of them
+ to be set to false in order to disable list cleanup; this broke the
+ installer. Instead, disable list cleanup if either of them is set to
+ false.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:34:37 +0000
+
+apt (0.7.9ubuntu3) hardy; urgency=low
+
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 19:02:11 +0100
+
+apt (0.7.9ubuntu2) hardy; urgency=low
+
+ [ Otavio Salvador ]
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
+ with newest dpkg-shlibdeps changing the packaging building order and a
+ patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
+ closes: #452862.
+ * Applied patch from Alexander Winston <alexander.winston@comcast.net>
+ to use 'min' as symbol for minute, closes: #219034.
+ * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
+ work properly in initramfs, closes: #448316.
+ * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
+ apt-get to ignore time conflicts, closes: #451328.
+ * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
+ grammatical error ("manual installed" -> "manually installed"),
+ closes: #438136.
+ * Fix cron.daily job to not call fail if apt isn't installed, closes:
+ #443286.
+
+ [ Daniel Burrows ]
+ * apt-pkg/contrib/configuration.cc:
+ - if RootDir is set, then FindFile and FindDir will return paths
+ relative to the directory stored in RootDir, closes: #456457.
+
+ [ Christian Perrier ]
+ * Fix wording for "After unpacking...". Thans to Michael Gilbert
+ for the patch. Closes: #260825
+
+ [ Program translations ]
+ - Vietnamese updated. Closes: #453774
+ - Japanese updated. Closes: #456909
+ - French updated.
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.{cc,h}:
+ - propergate the Immediate flag to make hitting the
+ "E: Internal Error, Could not perform immediate configuration (2)"
+ harder. (LP: #179247)
+ * debian/apt.conf.daily:
+ - print warning if the cache can not be locked (closes: #454561),
+ thanks to Bastian Kleineidam
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jan 2008 11:31:45 +0100
+
+apt (0.7.9ubuntu1) hardy; urgency=low
+
+ * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
+ changes:
+ - mirror download method (pending merge with debian)
+ - no pdiff download by default (unsuitable for ubuntu)
+ - no recommends-by-default yet
+ - add "Original-Maintainer" field to tagfile
+ - show warning on apt-get source if the package is maintained
+ in a VCS (pedinging merge with debian)
+ - use ubuntu-archive keyring instead of debians one
+ - support metapackages section for autoremoval
+ - debian maintainer field change
+ - send ubuntu string in user-agent
+
+ * Changes from the debian-sid bzr branch (but not uploaded to debian
+ yet):
+
+ [ Otavio Salvador ]
+ * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
+ apt-mark, closes: #430207.
+ * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
+ note about some frontends in apt.8 manpage, closes: #438545.
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
+ getting crazy when /dev/null is redirected to stdin (which breaks
+ buildds), closes: #452858.
+
+ [ Program translations ]
+ - Basque updated. Closes: #453088
+
+ [ Michael Vogt ]
+ * debian/rules
+ - fix https install location
+ * methods/gpgv.cc:
+ - remove cruft code that caused timestamp/I-M-S issues
+ * ftparchive/contents.cc:
+ - fix error output
+ * methods/mirror.{cc,h}:
+ - only update mirror list on IndexFile updates
+ * apt-pkg/acquire-item.{cc,h}:
+ - make the authentication download code more robust against
+ servers/proxies with broken If-Range implementations
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ [ Chris Cheney ]
+ * ftparchive/contents.cc:
+ - support lzma data members
+ * ftparchive/multicompress.cc:
+ - support lzma output
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 14:46:27 +0100
+
apt (0.7.9) unstable; urgency=low
[ Christian Perrier ]
@@ -4122,6 +5869,193 @@ apt (0.7.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200
+apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - give up timeslice on EIO error in read from master terminal
+ * debian/apt.cron.daily:
+ - only run the cron job if apt-get check succeeds (LP: #131719)
+
+ [ Martin Emrich ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - rewrite dpkgpm.cc to use pselect() instead of select()
+ to block signals during select() (LP: #134858)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 20 Oct 2007 07:51:12 +0200
+
+apt (0.7.6ubuntu14) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix resource leak (LP: #148806)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Oct 2007 20:57:44 +0200
+
+apt (0.7.6ubuntu13) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix crash in WriteApportReport (LP: #144537)
+ * apt-pkg/acquire-item.cc
+ - fix disappearing local Packages.gz file (LP: #131166)
+ * methods/https.cc:
+ - fix off-by-one error I-M-S handling
+ - cleanup after I-M-S hit
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Oct 2007 01:48:26 +0200
+
+apt (0.7.6ubuntu12) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file
+ (thanks to Laurent Bigonville, LP: #140019)
+ * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
+ in unspecified behaviour;
+ * Reset curl options and timestamp between downloaded files. Thanks to
+ Ryan Murray <rmurray@debian.org> for the patch
+
+ [Paul Sladen]
+ * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
+ to the bit bucket. Thanks to 'dasdda'. (LP: #115397)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 03 Oct 2007 02:17:45 +0200
+
+apt (0.7.6ubuntu11) gutsy; urgency=low
+
+ * apt-pkg/contrib/mmap.cc:
+ - don't fail if msync() returns > 0 (LP: #144001)
+
+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 22 Sep 2007 21:39:29 +0100
+
+apt (0.7.6ubuntu10) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix parse error when dpkg sends unexpected data
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Sep 2007 17:25:09 +0100
+
+apt (0.7.6ubuntu9) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix progress reporting precent calculation (LP: #137798)
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ (LP: #136767)
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes LP: #125733
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled (LP: #139448)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200
+
+apt (0.7.6ubuntu8) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - fix bug in dpkg log writing when a signal is caught during
+ select() (LP: #134858)
+ - write end marker in the log as well
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 Sep 2007 15:03:46 +0200
+
+apt (0.7.6ubuntu7) gutsy; urgency=low
+
+ * reupload to fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Aug 2007 19:44:20 +0200
+
+apt (0.7.6ubuntu6) gutsy; urgency=low
+
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Ian Jackson <iwj@ubuntu.com> Wed, 15 Aug 2007 20:44:37 +0100
+
+apt (0.7.6ubuntu5) UNRELEASED; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix file removal on local repo i-m-s hit (LP: #131166)
+ * tests/local-repo:
+ - added regression test for this bug
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Aug 2007 12:34:07 +0200
+
+apt (0.7.6ubuntu4) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - remove YnPrompt when a XS-Vcs- tag is found, improve the
+ notice (LP: #129575)
+ * methods/copy.cc:
+ - take hashes here too
+ * apt-pkg/acquire-worker.cc:
+ - only pass on computed hash if we recived one from the method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Aug 2007 19:30:29 +0200
+
+apt (0.7.6ubuntu3) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix packagename extraction when writting apport reports
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size (LP: #125640)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Aug 2007 09:52:00 +0200
+
+apt (0.7.6ubuntu2) gutsy; urgency=low
+
+ * doc/examples/sources.list:
+ - change example source to gutsy
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not break if no /dev/pts is available
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 06 Aug 2007 15:17:57 +0200
+
+apt (0.7.6ubuntu1) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * apt-inst/contrib/extracttar.cc:
+ - fix fd leak for zero size files (thanks to Bill Broadley for
+ reporting this bug)
+ * apt-pkg/acquire-item.cc:
+ - remove zero size files on I-M-S hit
+ * methods/https.cc:
+ - only send LastModified if we actually have a file
+ - send range request with if-range
+ - delete failed downloads
+ (thanks to Thom May for his help here)
+ - delete zero size I-M-S hits
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - merged dpkg-log branch, this lets you specify a
+ Dir::Log::Terminal file to log dpkg output to
+ (ABI break)
+ - when writting apport reports, attach the dpkg
+ terminal log too
+ * merged apt--sha256 branch to fully support the new
+ sha256 checksums in the Packages and Release files
+ (ABI break)
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size
+ * tests/local-repo:
+ - added local repository testcase
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes: #133421
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file (LP: #140019)
+ (thanks to Laurent Bigonville)
+
+ [ Ian Jackson ]
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200
+
apt (0.7.6) unstable; urgency=low
* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@ -4149,6 +6083,14 @@ apt (0.7.5) unstable; urgency=low
-- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300
+apt (0.7.4ubuntu1) gutsy; urgency=low
+
+ * debian/apt.conf.ubuntu, apt.conf.autoremove:
+ - Change metapackages to {restricted,universe,multiverse}/metapackages
+ in Install-Recommends-Sections and Never-MarkAuto-Sections
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Jul 2007 10:42:29 +0200
+
apt (0.7.4) unstable; urgency=low
[ Michael Vogt ]
@@ -4209,6 +6151,90 @@ apt (0.7.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200
+apt (0.7.2ubuntu7) gutsy; urgency=low
+
+ * fix build-dependencies
+ * fixes in the auto-mark code (thanks to Daniel
+ Burrows)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200
+
+apt (0.7.2ubuntu6) gutsy; urgency=low
+
+ [ Michael Vogt]
+ * cmdline/apt-get.cc:
+ - make the XS-Vcs-$foo warning more copy'n'paste
+ friendly (thanks to Matt Zimmerman)
+ - ignore the Vcs-Browser tag (Fixes LP: #121770)
+ * debian/apt.conf.autoremove:
+ - added "linux-ubuntu-modules" to APT::NeverAutoRemove
+
+ [ Sarah Hobbs ]
+ * Change metapackages to *metapackages in Install-Recommends-Section
+ and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
+ the Recommends of metapackages in universe and multiverse will get
+ installed.
+ * Also make this change in doc/examples/configure-index.
+ * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
+ docbook to fix FTBFS.
+ * Added in previous changelog entries, as those who uploaded did not
+ actually commit to Bzr.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000
+
+apt (0.7.2ubuntu5) gutsy; urgency=low
+
+ * Rerun autoconf to fix the FTBFS.
+
+ -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200
+
+apt (0.7.2ubuntu4) gutsy; urgency=low
+
+ * Rebuild for the libcurl4 -> libcurl3 transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000
+
+apt (0.7.2ubuntu3) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix InstallTask code when a pkgRecord ends
+ with a single '\n' (thanks to Soren Hansen for reporting)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200
+
+apt (0.7.2ubuntu2) gutsy; urgency=low
+
+ * fixed compile errors with g++ 4.3 (thanks to
+ Daniel Burrows, closes: #429378)
+ * fix FTFBFS by changing build-depends to
+ libcurl4-gnutls-dev (closes: #428363)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200
+
+apt (0.7.2ubuntu1) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - apport integration added, this means that a apport
+ report is written on dpkg failures
+ * cmdline/apt-get.cc:
+ - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
+ this will warn when Vcs- headers are found on apt-get source
+ (Fixes LP:#115959)
+ * merged from debian/unstable, remaining changes:
+ - maintainer field changed
+ - merged the apt--mirror branch
+ http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
+ - apport reporting on package install/upgrade/remove failure
+ - support for "Originial-Maintainer" field
+ - merged apt--xs-vcs-bzr branch
+ (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
+ - use ubuntu archive keyring by default
+ - debian/apt.conf.autoremove
+ + install recommands for section "metapackages"
+ + do not mark direct dependencies of "metapackages" as autoremoved
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200
+
apt (0.7.2-0.1) unstable; urgency=low
* Non-maintainer upload.
@@ -4331,6 +6357,116 @@ apt (0.7.0) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
+apt (0.6.46.4ubuntu10) feisty; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added "APT::Never-MarkAuto-Section" and consider dependencies
+ of packages in this section manual (LP#59893)
+ - ensure proper permissions in the extended_state file (LP#67037)
+ * debian/apt.conf.ubuntu:
+ - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
+ * cmdline/apt-get.cc:
+ - "apt-get install foo" on a already installed package foo will
+ clean the automatic installed flag (LP#72007)
+ - do not show packages already marked for removal as auto-installed
+ (LP#64493)
+ - applied patch to (optionally) hide the auto-remove information
+ (thanks to Frode M. Døving) (LP#69148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100
+
+apt (0.6.46.4ubuntu9) feisty; urgency=low
+
+ * debian/control:
+ - set XS-Vcs-Bzr header
+ - Set Ubuntu maintainer address
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ - only umount if it was mounted by the method before
+ * cmdline/apt-get.cc:
+ - fix version output in autoremove list (LP#68941)
+ * apt-pkg/packagemanager.cc:
+ - do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100
+
+apt (0.6.46.4ubuntu8) feisty; urgency=low
+
+ * fix segfault in the pkgRecords destructor
+ * Bump ABI version
+ * debian/control:
+ - make the libcurl3-gnutls-dev versionized (LP#86614)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100
+
+apt (0.6.46.4ubuntu7) feisty; urgency=low
+
+ * Merged the apt--mirror branch. This means that a new 'mirror'
+ method is available that will allow dynamic mirror updates.
+ The sources.list entry looks something like this:
+ "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
+
+ It also supports error reporting to a configurable url for mirror
+ problems/failures.
+ * Bump ABI version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100
+
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/algorithms.cc:
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100
+
+apt (0.6.46.4ubuntu5) feisty; urgency=low
+
+ * added apt-transport-https package to provide a optional
+ https transport (apt-https spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100
+
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - only increase the score of installed applications if they
+ are not obsolete
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
+
+apt (0.6.46.4ubuntu3) feisty; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ * apt-pkg/depcache.cc:
+ - never mark Required package for autoremoval (lp: #75882)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100
+
+apt (0.6.46.4ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+ (thanks to Ian Jackson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100
+
+apt (0.6.46.4ubuntu1) feisty; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100
+
apt (0.6.46.4-0.1) unstable; urgency=emergency
* NMU
@@ -4360,6 +6496,26 @@ apt (0.6.46.4) unstable; urgency=high
-- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100
+apt (0.6.46.3ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000
+
+apt (0.6.46.3ubuntu1) feisty; urgency=low
+
+ * doc/apt-get.8.xml:
+ - documented autoremove, thanks to Vladimír Lapá%Gč%@ek
+ (lp: #62919)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * po/en_GB.po:
+ - typo (lp: #61270)
+ * add apt-secure.8 to "See also" section
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100
+
apt (0.6.46.3-0.2) unstable; urgency=high
* Non-maintainer upload with permission of Michael Vogt.
@@ -4472,6 +6628,173 @@ apt (0.6.46) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu13) edgy; urgency=low
+
+ * no-changes upload to make apt rebuild against latest g++ and
+ fix synaptic FTBFS (see bug: #62461 for details)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200
+
+apt (0.6.45ubuntu12) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix in the sweep() code, set garbage flag for packages scheduled
+ for removal too
+ - do not change the autoFlag in MarkKeep(), this can lead to suprising
+ side effects
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200
+
+apt (0.6.45ubuntu11) edgy; urgency=low
+
+ * removed "installtask" and change it so that tasknames can be given
+ with "apt-get install taskname^"
+ * improve the writeStateFile() code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200
+
+apt (0.6.45ubuntu10) edgy; urgency=low
+
+ * methods/http.cc:
+ - check more careful for incorrect proxy settings (closes: #378868)
+ * methods/gzip.cc:
+ - don't hang when /var is full (closes: #341537), thanks to
+ Luis Rodrigo Gallardo Cruz for the patch
+ * doc/examples/sources.list:
+ - removed non-us.debian.org from the example (closes: #380030,#316196)
+ * Merged from Christian Perrier bzr branch:
+ * ro.po: Updated to 514t. Closes: #388402
+ * dz.po: Updated to 514t. Closes: #388184
+ * it.po: Fixed typos. Closes: #387812
+ * ku.po: New kurdish translation. Closes: #387766
+ * sk.po: Updated to 514t. Closes: #386851
+ * ja.po: Updated to 514t. Closes: #386537
+ * gl.po: Updated to 514t. Closes: #386397
+ * fr.po: Updated to 516t.
+ * fi.po: Updated to 512t. Closes: #382702
+ * share/archive-archive.gpg:
+ - removed the outdated amd64 and debian-2004 keys
+ * apt-pkg/tagfile.cc:
+ - applied patch from Jeroen van Wolffelaar to make the tags
+ caseinsensitive (closes: #384182)
+ - reverted MMap use in the tagfile because it does not work
+ across pipes (closes: #383487)
+ * added "installtask" command
+ * added new ubuntu specific rewrite rule for "Original-Maintainer"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200
+
+apt (0.6.45ubuntu9) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - if --no-remove is given, do not run the AutoRemove code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200
+
+apt (0.6.45ubuntu8) edgy; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
+ information (lp: #59457)
+ * cmdline/apt-get.cc:
+ - fix typo in autoremove information (lp: #59420)
+ * install apt-mark to modify the automatically install information for
+ packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200
+
+apt (0.6.45ubuntu7) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
+
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
+
apt (0.6.45) unstable; urgency=low
* apt-pkg/contrib/sha256.cc:
@@ -4517,6 +6840,37 @@ apt (0.6.45) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
+apt (0.6.44.2ubuntu4) edgy; urgency=low
+
+ * Make apt-get dselect-upgrade happy again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
+
+apt (0.6.44.2ubuntu3) edgy; urgency=low
+
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
+
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
apt (0.6.44.2exp1) experimental; urgency=low
* added support for i18n of the package descriptions
@@ -4605,6 +6959,26 @@ apt (0.6.44) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@ -4637,6 +7011,38 @@ apt (0.6.43.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
+
apt (0.6.43.2) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@ -4660,6 +7066,24 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
apt (0.6.43.1) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@ -4683,6 +7107,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -4703,6 +7140,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -4809,6 +7262,80 @@ apt (0.6.41) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
+
apt (0.6.40.1) unstable; urgency=low
* bugfix in the parsing code for the apt<->dpkg communication. apt
@@ -4818,6 +7345,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -4833,6 +7366,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -4845,6 +7411,13 @@ apt (0.6.39) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
+
apt (0.6.38) unstable; urgency=low
* Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
diff --git a/debian/control b/debian/control
index ec0d817fb..b793d3f04 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,24 @@
Source: apt
Section: admin
Priority: important
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
Julian Andres Klode <jak@debian.org>
Standards-Version: 3.9.3
Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
- gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
+ gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
po4a (>= 0.34-2), autotools-dev, autoconf, automake
Build-Depends-Indep: doxygen, debiandoc-sgml
Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
+Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
+Vcs-Browser: http://code.launchpad.net/apt/ubuntu
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
+Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
Replaces: manpages-pl (<< 20060617-3~)
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
diff --git a/debian/rules b/debian/rules
index 83e23881c..8da5ae790 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
+# build in verbose mode by default to make it easy to diangose issues
+export NOISY=1
+
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -182,6 +185,8 @@ apt: build build-manpages
# apt install
#
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
+ cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
# make rosetta happy and remove pot files in po/ (but leave stuff
# in po/domains/* untouched) and cp *.po into each domain dir
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 6a36d08ca..9d51f4f7b 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -130,7 +130,7 @@
Update the local keyring with the archive keyring and remove from
the local keyring the archive keys which are no longer valid.
The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
- distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+ distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
</para>
@@ -180,12 +180,12 @@
<listitem><para>Local trust database of archive keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
- <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
- <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
index 745e32cbe..00db2f8cd 100644
--- a/doc/examples/sources.list.in
+++ b/doc/examples/sources.list.in
@@ -1,8 +1,10 @@
# See sources.list(5) manpage for more information
# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-deb http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
diff --git a/doc/makefile b/doc/makefile
index 8021bce3f..4c27552f6 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -42,7 +42,7 @@ SOURCE = apt.8
include $(MANPAGE_H)
examples/sources.list: examples/sources.list.in apt-verbatim.ent
- sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+ sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a9c5b24f9..b3a388c7e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 03adfbc61..990867f4d 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -2300,12 +2300,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
@@ -2374,24 +2381,33 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
diff --git a/doc/po/es.po b/doc/po/es.po
index 9b811db96..728b40182 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -2381,8 +2381,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2439,24 +2439,33 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index dd4ea430c..a390fd74e 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -2309,8 +2309,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2367,24 +2367,33 @@ msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/it.po b/doc/po/it.po
index 015003796..ab1962bf1 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -1586,8 +1586,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1636,23 +1636,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 4effb1a7b..5796671fe 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -2380,8 +2380,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2448,26 +2448,35 @@ msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
# type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4e16f0240..051fbf8ed 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -2413,8 +2413,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i "
"usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy "
@@ -2490,24 +2490,33 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index c900e78c1..233d6e17a 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2332,8 +2332,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2398,24 +2398,33 @@ msgstr "Base de dados local de confiança de chaves de arquivos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b4b0c4f06..5ef3628b5 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -1618,8 +1618,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1669,23 +1669,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 5c64141cf..63e4ec052 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr ""
@@ -152,7 +152,7 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -241,7 +241,7 @@ msgstr ""
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -532,8 +532,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -567,7 +567,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -576,7 +576,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr ""
@@ -757,33 +757,28 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -791,141 +786,141 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -971,7 +966,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1039,7 +1034,7 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1063,7 +1058,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1430,8 +1425,8 @@ msgstr ""
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1818,9 +1813,9 @@ msgstr ""
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1828,6 +1823,8 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
#: cmdline/apt-sortpkgs.cc:89
@@ -2034,25 +2031,25 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2595,12 +2592,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2691,7 +2688,7 @@ msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr ""
@@ -2699,7 +2696,7 @@ msgstr ""
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
@@ -2940,49 +2937,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr ""
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3007,115 +3004,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3127,7 +3124,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 88158d0d1..1cb697ab9 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -115,7 +115,7 @@ msgstr "يجب أن تعطي صيغة واحدة بالضبط"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "تعذر العثور على الحزمة %s"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -249,7 +249,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -542,8 +542,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
@@ -580,7 +580,7 @@ msgstr "إجهاض."
msgid "Do you want to continue [Y/n]? "
msgstr "هل تريد الاستمرار [Y/n]؟"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
@@ -589,7 +589,7 @@ msgstr "فشل إحضار %s %s\n"
msgid "Some files failed to download"
msgstr "فشل تنزيل بعض الملفات"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
@@ -775,33 +775,28 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -809,141 +804,141 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ليس هناك مساحة كافية في %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -989,7 +984,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1060,7 +1055,7 @@ msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1084,7 +1079,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1455,8 +1450,8 @@ msgstr "خطأ داخلي"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
@@ -1845,9 +1840,9 @@ msgstr "فشل تغيير اسم %s إلى %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1855,6 +1850,8 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
#: cmdline/apt-sortpkgs.cc:89
@@ -2063,26 +2060,26 @@ msgstr "تعذر إرسال الأمر PORT"
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "فشلت كتابة الملف %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2626,12 +2623,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "نظام الحزم '%s' غير مدعوم"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2722,7 +2719,7 @@ msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "قراءة قوائم الحزم"
@@ -2730,7 +2727,7 @@ msgstr "قراءة قوائم الحزم"
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
@@ -2975,49 +2972,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "إجهاض التثبيت."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3042,115 +3039,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "تهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "فشل إغلاق الملف %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "تحضير %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "فتح %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "التحضير لتهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "التحضير لإزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "تم إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "التحضير لإزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3162,7 +3159,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 070ffb525..a508c43c0 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -107,7 +107,7 @@ msgstr "Has de dar polo menos un patrón de gueta"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nun pue alcontrase'l paquete %s"
@@ -152,7 +152,7 @@ msgid " Version table:"
msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -588,8 +588,8 @@ msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -626,7 +626,7 @@ msgstr "Encaboxar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quies continuar [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
@@ -635,7 +635,7 @@ msgstr "Falló algamar %s %s\n"
msgid "Some files failed to download"
msgstr "Dellos ficheros nun pudieron descargase"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
@@ -834,26 +834,21 @@ msgstr "Error internu, l'iguador de problemes frañó coses"
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -862,7 +857,7 @@ msgstr ""
"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -874,87 +869,87 @@ msgstr ""
"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
"paquete.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nun hai espaciu llibre bastante en %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orde build '%s'.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Falló el procesu fíu"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
"construcción"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construcción.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -963,7 +958,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -972,14 +967,14 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
"enforma nuevu"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -988,7 +983,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque denguna versión "
"disponible del paquete %s satisfaz los requisitos de versión"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -997,30 +992,30 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1111,7 +1106,7 @@ msgstr ""
"pa más información y opciones.\n"
" Esti APT tien Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1187,7 +1182,7 @@ msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -1211,7 +1206,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1585,8 +1580,8 @@ msgstr "Fallu internu"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nun ye a lleer %s"
@@ -2033,11 +2028,10 @@ msgid "Failed to rename %s to %s"
msgstr "Nun pudo renomase %s como %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2045,18 +2039,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
-"\n"
-"apt-extracttemplates ye un preséu pa sacar información de\n"
-"configuración y plantíes de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"-h Esti testu d'aida.\n"
-"-t Define'l direutoriu temporal\n"
-"-c=? Llei esti ficheru de configuración\n"
-"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
-"tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2273,11 +2258,11 @@ msgstr "Nun se pudo sincronizase mmap "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nun se pudo facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Falló al francer el ficheru"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2286,7 +2271,7 @@ msgstr ""
"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2294,7 +2279,7 @@ msgid ""
msgstr ""
"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu"
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2857,12 +2842,12 @@ msgstr "El métodu %s nun entamó correchamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
@@ -2956,7 +2941,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lleendo llista de paquetes"
@@ -2964,7 +2949,7 @@ msgstr "Lleendo llista de paquetes"
msgid "Collecting File Provides"
msgstr "Recoyendo ficheros qu'apurren"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Fallu de E/S al grabar caché d'oríxenes"
@@ -3223,33 +3208,33 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "L'aniellu de claves nun s'instaló en %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nun s'alcontró la versión '%s' pa '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nun pudo alcontrase la xera '%s'"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3258,21 +3243,21 @@ msgstr ""
"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
"como non tien nengún d'ellos"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
"virtual"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
"candidata"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3298,111 +3283,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Desinstalando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Anotando desaniciáu de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando activador de post-instalación de %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta'l direutoriu '%s'."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nun pudo abrise'l ficheru '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose pa configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instaláu"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose pa desinstalar %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s desinstaláu"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose pa desinstalar dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nun puede escribise nel rexistru, falló openpty() (¿/dev/pts nun ta "
"montáu?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Executando dpkt"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3410,7 +3395,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
"siguió dende un fallu previu"
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3426,7 +3411,16 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"memoria"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"discu llenu"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3461,6 +3455,31 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
+#, fuzzy
+#~ 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 ""
+#~ "Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates ye un preséu pa sacar información de\n"
+#~ "configuración y plantíes de paquetes de debian.\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "-h Esti testu d'aida.\n"
+#~ "-t Define'l direutoriu temporal\n"
+#~ "-c=? Llei esti ficheru de configuración\n"
+#~ "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Nun ye a desaniciar %s"
diff --git a/po/bg.po b/po/bg.po
index f967cbc71..f62442728 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -113,7 +113,7 @@ msgstr "Трябва да въведете поне един шаблон за
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Пакетът %s не може да бъде намерен"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -294,7 +294,7 @@ msgstr "Y"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -598,8 +598,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -636,7 +636,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -645,7 +645,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n"
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -845,26 +845,21 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Изтегляне на %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -874,7 +869,7 @@ msgstr ""
"адрес:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -886,70 +881,70 @@ msgstr ""
"за да изтеглите последните промени в пакета (евентуално в процес на "
"разработка).\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -958,18 +953,18 @@ msgstr ""
"Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
"Architectures в apt.conf(5)."
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -978,7 +973,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява "
"за пакети „%s“"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -987,14 +982,14 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1003,7 +998,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията "
"кандидат на пакета %s не може да удовлетвори изискването за версия"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1012,30 +1007,30 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"няма подходящи версии"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Журнал на промените в %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1125,7 +1120,7 @@ msgstr ""
"информация и опции.\n"
" Това APT има Върховни Сили.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1200,7 +1195,7 @@ msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -1224,7 +1219,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1240,25 +1235,6 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-"Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n"
-"\n"
-"apt-mark предоставя команден интерфейс за маркиране на пакети\n"
-"като инсталирани ръчно или автоматично. Предлага се и показване\n"
-"на текущата маркировка.\n"
-"\n"
-"Команди:\n"
-" auto — Маркиране на пакети като инсталирани автоматично\n"
-" manual — Маркиране на пакети като инсталирани ръчно\n"
-"\n"
-"Опции:\n"
-" -h Тази помощна информация\n"
-" -q Изход без информация за напредъка, подходящ за съхраняване\n"
-" -qq Без изход, освен при грешки\n"
-" -s Симулация. Само се извежда какво би било направено\n"
-" -f Четене/запис на информацията за маркировката от указания файл\n"
-" -c=? Указване на файл с настройки\n"
-" -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
-"За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)."
#: methods/cdrom.cc:203
#, c-format
@@ -1622,8 +1598,8 @@ msgstr "Вътрешна грешка"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
@@ -2073,9 +2049,9 @@ msgstr "Неуспех при преименуването на %s на %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2083,17 +2059,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Употреба: apt-internal-solver\n"
-"\n"
-"apt-internal-solver е интерфейс към вградения в APT механизъм за "
-"удовлетворяване на зависимости\n"
-"\n"
-"Опции:\n"
-" -h Този помощен текст\n"
-" -q Изход, подходящ за журнал — без индикатор на напредъка\n"
-" -c=? Указване на файл с настройки\n"
-" -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2310,11 +2278,11 @@ msgstr "Неуспех при синхронизирането на mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Неуспех при отрязване на края на файла"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2323,7 +2291,7 @@ msgstr ""
"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
"Limit. Текуща стойност: %lu (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2332,7 +2300,7 @@ msgstr ""
"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото "
"ограничение от %lu байта."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2904,12 +2872,12 @@ msgstr "Методът %s не стартира правилно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Пакетната система „%s“ не е поддържана"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Неуспех при определянето на подходяща пакетна система"
@@ -3010,7 +2978,7 @@ msgstr ""
"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Четене на списъците с пакети"
@@ -3018,7 +2986,7 @@ msgstr "Четене на списъците с пакети"
msgid "Collecting File Provides"
msgstr "Събиране на информация за „Осигурява“"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
@@ -3278,32 +3246,32 @@ msgstr "Файлът %s не започва с информация за под
msgid "No keyring installed in %s."
msgstr "В %s няма инсталиран ключодържател."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Не е намерено издание „%s“ на „%s“"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Не е намерена версия „%s“ на „%s“"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Неуспех при намиране на задача „%s“"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3312,21 +3280,21 @@ msgstr ""
"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
"понеже той няма нито едната"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
"виртуален"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
"подходящ кандидати"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3355,113 +3323,113 @@ msgstr ""
msgid "Execute external solver"
msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Инсталиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Конфигуриране на %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Окончателно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Отбелязване на изчезването на %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Изпълнение на тригер след инсталиране %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Директорията „%s“ липсва"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Неуспех при отваряне на файла „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Подготвяне на %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Разпакетиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготвяне на %s за конфигуриране"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s е инсталиран"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготвяне за премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s е премахнат"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка за пълно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
"монтирана?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Изпълняване на dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "Операцията е прекъсната"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
"доклад за зависимостите."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "отлагане на настройката поради неудовлетворени зависимости"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3469,7 +3437,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
"от друга грешка."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3485,7 +3453,16 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчна оперативна памет"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчно дисково пространство"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3521,6 +3498,72 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ msgid "Can't find a source to download version '%s' of '%s'"
+#~ msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n"
+#~ "\n"
+#~ "apt-mark предоставя команден интерфейс за маркиране на пакети\n"
+#~ "като инсталирани ръчно или автоматично. Предлага се и показване\n"
+#~ "на текущата маркировка.\n"
+#~ "\n"
+#~ "Команди:\n"
+#~ " auto — Маркиране на пакети като инсталирани автоматично\n"
+#~ " manual — Маркиране на пакети като инсталирани ръчно\n"
+#~ "\n"
+#~ "Опции:\n"
+#~ " -h Тази помощна информация\n"
+#~ " -q Изход без информация за напредъка, подходящ за съхраняване\n"
+#~ " -qq Без изход, освен при грешки\n"
+#~ " -s Симулация. Само се извежда какво би било направено\n"
+#~ " -f Четене/запис на информацията за маркировката от указания файл\n"
+#~ " -c=? Указване на файл с настройки\n"
+#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
+#~ "За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)."
+
+#~ 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 ""
+#~ "Употреба: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver е интерфейс към вградения в APT механизъм за "
+#~ "удовлетворяване на зависимости\n"
+#~ "\n"
+#~ "Опции:\n"
+#~ " -h Този помощен текст\n"
+#~ " -q Изход, подходящ за журнал — без индикатор на напредъка\n"
+#~ " -c=? Указване на файл с настройки\n"
+#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Неуспех при премахването на %s"
diff --git a/po/bs.po b/po/bs.po
index 6a4772811..4ddeae415 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Ne mogu pronaći paket %s"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -255,7 +255,7 @@ msgstr ""
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -549,8 +549,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -585,7 +585,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -594,7 +594,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr ""
@@ -776,33 +776,28 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -810,141 +805,141 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -990,7 +985,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1058,7 +1053,7 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1082,7 +1077,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1453,8 +1448,8 @@ msgstr "Unutrašnja greška"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1842,9 +1837,9 @@ msgstr ""
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1852,6 +1847,8 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
#: cmdline/apt-sortpkgs.cc:89
@@ -2060,26 +2057,26 @@ msgstr "Ne mogu kreirati %s"
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2624,12 +2621,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2720,7 +2717,7 @@ msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Čitam spiskove paketa"
@@ -2728,7 +2725,7 @@ msgstr "Čitam spiskove paketa"
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
@@ -2972,49 +2969,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Odustajem od instalacije."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3039,115 +3036,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se sa %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Preporučuje"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3159,7 +3156,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 283af2e4f..7842a42e3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2011-06-16 01:41+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -110,7 +110,7 @@ msgstr "Heu de donar com a mínim un patró de cerca"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Aquesta ordre és desfasada. Empreu «apt-mark showauto» en el seu lloc."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "No s'ha trobat el paquet %s"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -595,8 +595,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -633,7 +633,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -642,7 +642,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut baixar"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Baixada completa i en mode de només baixada"
@@ -847,26 +847,21 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "S'està baixant %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -876,7 +871,7 @@ msgstr ""
"versions «%s» a:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -888,89 +883,89 @@ msgstr ""
"per a obtenir les últimes actualitzacions (possiblement no publicades) del "
"paquet.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Obtén el font %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -979,7 +974,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -988,14 +983,14 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és "
"massa nou"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1004,7 +999,7 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet "
"%s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1008,30 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Registre de canvis per a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1126,7 +1121,7 @@ msgstr ""
"per a obtenir més informació i opcions.\n"
" Aquest APT té superpoders bovins.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1201,7 +1196,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ja estava sense marcar com a mantingut.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -1225,7 +1220,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1624,8 +1619,8 @@ msgstr "Error intern"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -2071,11 +2066,10 @@ msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2083,17 +2077,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-extracttemplates és una eina per a extreure informació de\n"
-"configuració i plantilles dels paquets debian\n"
-"\n"
-"Opcions:\n"
-" -h Aquest text d'ajuda.\n"
-" -t Estableix el directori temporal\n"
-" -c=? Llegeix aquest fitxer de configuració\n"
-" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2309,11 +2295,11 @@ msgstr "No es pot sincronitzar el mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "No s'ha pogut truncar el fitxer %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2322,7 +2308,7 @@ msgstr ""
"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
"Limit. Valor actual: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2331,7 +2317,7 @@ msgstr ""
"No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
"s'ha superat."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2901,12 +2887,12 @@ msgstr "El mètode %s no s'ha iniciat correctament"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament «%s» no està suportat"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -3006,7 +2992,7 @@ msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "S'està llegint la llista de paquets"
@@ -3014,7 +3000,7 @@ msgstr "S'està llegint la llista de paquets"
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
@@ -3277,34 +3263,34 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "No s'ha instaŀlat cap clauer a %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No s'ha pogut trobar la tasca «%s»"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
"virtual"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3313,21 +3299,21 @@ msgstr ""
"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
"«%s» ja que no estan disponibles cap de les dues"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
"purament virtual"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
"candidata"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3354,111 +3340,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "S'està instaŀlant %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "S'està configurant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "S'està suprimint el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "S'ha suprimit completament %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Anotant la desaparició de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "S'està executant l'activador de postinstaŀlació %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Manca el directori «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "No s'ha pogut obrir el fitxer «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "S'està preparant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "S'està desempaquetant %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "S'està preparant per a configurar el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "S'ha instaŀlat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "S'està preparant per a la supressió del paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "S'ha suprimit el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "S'està preparant per a suprimir completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
"pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "S'està executant dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "S'han produït problemes de depències, es deixa sense configurar"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3466,7 +3452,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
"consequent de una fallida anterior."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3482,7 +3468,16 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"falta de memòria"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3517,6 +3512,72 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n"
+#~ "\n"
+#~ "apt-mark és una interfície simple de la línia d'ordres per a marcar\n"
+#~ "paquets com a instaŀlats automàticament o manual. També pot llistar\n"
+#~ "les marques.\n"
+#~ "\n"
+#~ "Ordres:\n"
+#~ "\n"
+#~ " auto - Marca els paquets donats com a instaŀlats automàticament\n"
+#~ " manual - Marca els paquets donats com a instaŀlats manualment\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ " -h Aquest text d'ajuda.\n"
+#~ " -q Sortida enregistrable - sense indicador de progrés\n"
+#~ " -qq Sense sortida, llevat dels errors\n"
+#~ " -s No actues. Mostra només què es faria.\n"
+#~ " -f Llegeix/escriu les marques auto/manual emprant el fitxer donat\n"
+#~ " -c=? Llegeix aquest fitxer de configuració\n"
+#~ " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
+#~ "Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més "
+#~ "informació."
+
+#, fuzzy
+#~ 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 ""
+#~ "Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+#~ "\n"
+#~ "apt-extracttemplates és una eina per a extreure informació de\n"
+#~ "configuració i plantilles dels paquets debian\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ " -h Aquest text d'ajuda.\n"
+#~ " -t Estableix el directori temporal\n"
+#~ " -c=? Llegeix aquest fitxer de configuració\n"
+#~ " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "No es pot suprimir %s"
diff --git a/po/cs.po b/po/cs.po
index 203eaeaf3..4c4cf67c7 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-11-27 13:54+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -109,7 +109,7 @@ msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nelze najít balík %s"
@@ -153,7 +153,7 @@ msgid " Version table:"
msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -291,7 +291,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -590,8 +590,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po této operaci bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nelze určit volné místo v %s"
@@ -628,7 +628,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -637,7 +637,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -840,26 +840,21 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
msgid "Unable to lock the download directory"
msgstr "Nelze zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nelze najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -868,7 +863,7 @@ msgstr ""
"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -879,107 +874,107 @@ msgstr ""
"použijte:\n"
"bzr get %s\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nelze získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -988,37 +983,37 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Připojuji se k %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1106,7 +1101,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tato APT má schopnosti svaté krávy.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1181,7 +1176,7 @@ msgid "%s was already not hold.\n"
msgstr "%s je již nejnovější verze.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -1205,7 +1200,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1578,8 +1573,8 @@ msgstr "Vnitřní chyba"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nelze číst %s"
@@ -2018,11 +2013,10 @@ msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2030,16 +2024,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
-"\n"
-"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n"
-"\n"
-"Volby:\n"
-" -h Tato nápověda.\n"
-" -t Nastaví dočasný adresář\n"
-" -c=? Načte tento konfigurační soubor\n"
-" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2255,11 +2242,11 @@ msgstr "Nelze synchronizovat mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Nelze zmenšit soubor"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2268,14 +2255,14 @@ msgstr ""
"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Limit. "
"Současná hodnota: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2834,12 +2821,12 @@ msgstr "Metoda %s nebyla spuštěna správně"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém „%s“ není podporován"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2931,7 +2918,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Čtu seznamy balíků"
@@ -2939,7 +2926,7 @@ msgstr "Čtu seznamy balíků"
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
@@ -3195,32 +3182,32 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "V %s není nainstalována žádná klíčenka."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nelze najít úlohu „%s“"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3229,17 +3216,17 @@ msgstr ""
"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
"žádné takové verze nemá"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
@@ -3264,110 +3251,110 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavuji %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Kompletně odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Značím si zmizení %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Spouštím poinstalační spouštěč %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresář „%s“ chybí"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nelze otevřít soubor „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Připravuji %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Připravuji nastavení %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Nainstalován %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Připravuji odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Připravuji úplné odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Spouštím dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3375,7 +3362,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"se jedná o chybu způsobenou předchozí chybou."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3391,7 +3378,16 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněnou pamětí."
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
+"je chyba způsobena zcela zaplněným diskem."
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3422,6 +3418,30 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#, fuzzy
+#~ 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 ""
+#~ "Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
+#~ "\n"
+#~ "apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a "
+#~ "šablony\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ " -h Tato nápověda.\n"
+#~ " -t Nastaví dočasný adresář\n"
+#~ " -c=? Načte tento konfigurační soubor\n"
+#~ " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Selhalo odstranění %s"
diff --git a/po/cy.po b/po/cy.po
index ec5d59a2b..4a14f126a 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -124,7 +124,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
@@ -172,7 +172,7 @@ msgid " Version table:"
msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -314,7 +314,7 @@ msgstr "I"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -622,8 +622,8 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -661,7 +661,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -670,7 +670,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -867,33 +867,28 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -901,86 +896,86 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -989,7 +984,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -998,14 +993,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1014,7 +1009,7 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1023,32 +1018,32 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1135,7 +1130,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1206,7 +1201,7 @@ msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1230,7 +1225,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1616,8 +1611,8 @@ msgstr "Gwall mewnol"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -2062,13 +2057,11 @@ msgstr "Gwall wrth datgysylltu %s"
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
-# FIXME: "debian"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2076,17 +2069,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-" -h Dangos y testun cymorth hwn\n"
-" -t Gosod y cyfeiriadur dros dro\n"
-" -c=? Darllen y ffeil cyfluniad hwn\n"
-" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2312,26 +2297,26 @@ msgstr "Methwyd gweithredu "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2908,12 +2893,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -3011,7 +2996,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
@@ -3020,7 +3005,7 @@ msgstr "Yn Darllen Rhestrau Pecynnau"
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -3275,49 +3260,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Yn Erthylu'r Sefydliad."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3342,115 +3327,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3462,7 +3447,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3491,6 +3482,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
+# FIXME: "debian"
+#, fuzzy
+#~ 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 ""
+#~ "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+#~ "\n"
+#~ "Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+#~ "templed o becynnau Debian.\n"
+#~ "\n"
+#~ "Opsiynnau:\n"
+#~ " -h Dangos y testun cymorth hwn\n"
+#~ " -t Gosod y cyfeiriadur dros dro\n"
+#~ " -c=? Darllen y ffeil cyfluniad hwn\n"
+#~ " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Methwyd dileu %s"
diff --git a/po/da.po b/po/da.po
index d1293d3e5..6fee76e3f 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-02 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -114,7 +114,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunne ikke lokalisere pakken %s"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -295,7 +295,7 @@ msgstr "J"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -595,8 +595,8 @@ msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -633,7 +633,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsætte [J/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -642,7 +642,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -844,26 +844,21 @@ msgstr "Intern fejl. Problemløseren ødelagde noget"
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Henter %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -872,7 +867,7 @@ msgstr ""
"BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -883,68 +878,68 @@ msgstr ""
"bzr branch %s\n"
"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -953,17 +948,17 @@ msgstr ""
"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
"Architectures for opsætning"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -971,7 +966,7 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -979,14 +974,14 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -995,7 +990,7 @@ msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
"kandidater for pakken %s kan tilfredsstille versionskravene"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1004,30 +999,30 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
"kandidatversion"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Ændringslog for %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1115,7 +1110,7 @@ msgstr ""
"for flere oplysninger og tilvalg.\n"
" Denne APT har »Super Cow Powers«.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1190,7 +1185,7 @@ msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -1214,7 +1209,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1610,8 +1605,8 @@ msgstr "Intern fejl"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke læse %s"
@@ -2058,9 +2053,9 @@ msgstr "Kunne ikke omdøbe %s til %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2068,10 +2063,12 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Brug: apt-internal-solver\n"
+"Brug: apt-internal-resolver\n"
"\n"
-"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
+"apt-internal-resolver er en grænseflade, der skal bruge den aktuelle\n"
"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
"eller lignende\n"
"\n"
@@ -2080,6 +2077,8 @@ msgstr ""
" -q Logbare uddata - ingen statusindikator\n"
" -c=? Læs denne konfigurationsfil\n"
" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
+"apt.conf(5)-manualsider for yderligere information og indstillinger.\n"
+" Denne APT har Super Cow Powers.\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2297,11 +2296,11 @@ msgstr "Kunne ikke synkronisere mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udføre mmap for %lu byte"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Kunne ikke afkorte filen"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2310,7 +2309,7 @@ msgstr ""
"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Limit. "
"Aktuel værdi: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2319,7 +2318,7 @@ msgstr ""
"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er "
"nået."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2876,12 +2875,12 @@ msgstr "Metoden %s startede ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understøttes ikke"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2976,7 +2975,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Indlæser pakkelisterne"
@@ -2984,7 +2983,7 @@ msgstr "Indlæser pakkelisterne"
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
@@ -3244,32 +3243,32 @@ msgstr "Fil %s starter ikke med en »clearsigned« besked"
msgid "No keyring installed in %s."
msgstr "Ingen nøglering installeret i %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunne ikke finde opgaven '%s'"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge versioner fra pakke '%s' som er vitalt"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3278,18 +3277,18 @@ msgstr ""
"Kan ikke vælge installeret eller kandidatversion fra pakke '%s' da den ikke "
"har nogen af dem"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge nyeste version fra pakke '%s' som er vital"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3315,110 +3314,110 @@ msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
msgid "Execute external solver"
msgstr "Kør ekstern problemløser"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerer %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Sætter %s op"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Fjerner %s helt"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Bemærker forsvinding af %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kører førinstallationsudløser %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mappe '%s' mangler"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunne ikke åbne filen '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Klargør %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Pakker %s ud"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Gør klar til at sætte %s op"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Gør klar til afinstallation af %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Fjernede %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Gør klar til at fjerne %s helt"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Kører dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "Handling blev afbrudt før den kunne afsluttes"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3426,7 +3425,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
"opfølgningsfejl fra en tidligere fejl."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3441,7 +3440,15 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
"hukommelsesfejl"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
@@ -3471,6 +3478,71 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n"
+#~ "\n"
+#~ "apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n"
+#~ "som manuelt eller automatisk installeret. Programmet kan også vise\n"
+#~ "markeringerne.\n"
+#~ "\n"
+#~ "Kommandoer:\n"
+#~ " auto - Marker de givne pakker som automatisk installeret\n"
+#~ " manual - Marker de givne pakker som manuelt installeret\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ " -h Denne hjælpetekst.\n"
+#~ " -q Logbar uddata - ingen statusindikator\n"
+#~ " -qq Ingen uddata undtagen for fejl\n"
+#~ " -s Ingen handling. Viser kun hvad der ville blive udført.\n"
+#~ " -f læs/skriv auto/manuel markering i den givne fil\n"
+#~ " -c=? Læs denne konfigurationsfil\n"
+#~ " -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
+
+#~ 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 ""
+#~ "Brug: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
+#~ "interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
+#~ "eller lignende\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ " -h Denne hjælpetekst.\n"
+#~ " -q Logbare uddata - ingen statusindikator\n"
+#~ " -c=? Læs denne konfigurationsfil\n"
+#~ " -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Kunne ikke slette %s"
diff --git a/po/de.po b/po/de.po
index cb35a3acd..219c84dbc 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
"Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark "
"showauto«."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Paket %s kann nicht gefunden werden."
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Versionstabelle:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -301,7 +301,7 @@ msgstr "J"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -608,8 +608,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden."
@@ -646,7 +646,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
@@ -655,7 +655,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
@@ -861,30 +861,23 @@ msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:2386
-#, 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."
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Herunterladen von %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen."
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden."
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -894,7 +887,7 @@ msgstr ""
"auf:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -906,70 +899,70 @@ msgstr ""
"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
"für das Paket abzurufen.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genügend freien Speicherplatz in %s."
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen.\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -978,18 +971,18 @@ msgstr ""
"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
"finden Sie unter apt.conf(5) APT::Architectures."
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bauabhängigkeiten.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -998,7 +991,7 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
"nicht erlaubt ist."
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1007,14 +1000,14 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
"ist zu neu."
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1024,7 +1017,7 @@ msgstr ""
"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
"erfüllen kann."
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1033,30 +1026,30 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
"Installationskandidat existiert."
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1151,7 +1144,7 @@ msgstr ""
"bezüglich weitergehender Informationen und Optionen.\n"
" Dieses APT hat Super-Kuh-Kräfte.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1228,7 +1221,7 @@ msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1252,7 +1245,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1662,8 +1655,8 @@ msgstr "Interner Fehler"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s kann nicht gelesen werden."
@@ -2118,9 +2111,9 @@ msgstr "%s konnte nicht in %s umbenannt werden."
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2128,10 +2121,12 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Aufruf: apt-internal-solver\n"
+"Aufruf: apt-internal-resolver\n"
"\n"
-"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
+"apt-internal-resolver ist eine Schnittstelle, um den derzeitigen internen\n"
"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
"Fehlersuche oder ähnlichem.\n"
"\n"
@@ -2140,6 +2135,9 @@ msgstr ""
" -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
" -c=? Diese Konfigurationsdatei benutzen\n"
" -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+"Siehe auch die Handbuchseite apt.conf(5) bezüglich weitergehender\n"
+"Informationen und Optionen.\n"
+" Dieses APT hat Super-Kuh-Kräfte.\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2357,11 +2355,11 @@ msgstr "mmap konnte nicht synchronisiert werden."
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden."
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Datei konnte nicht eingekürzt werden."
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2370,7 +2368,7 @@ msgstr ""
"Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::"
"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2379,7 +2377,7 @@ msgstr ""
"Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits "
"erreicht ist."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2954,12 +2952,12 @@ msgstr ""
"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
"drücken Sie die Eingabetaste (Enter)."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt."
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
@@ -3066,7 +3064,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Paketlisten werden gelesen"
@@ -3074,7 +3072,7 @@ msgstr "Paketlisten werden gelesen"
msgid "Collecting File Provides"
msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
@@ -3339,34 +3337,34 @@ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
msgid "No keyring installed in %s."
msgstr "Kein Schlüsselring in %s installiert"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Task »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3375,21 +3373,21 @@ msgstr ""
"Es kann weder eine installierte Version noch ein Installationskandidat von "
"Paket »%s« ausgewählt werden, da beide nicht existieren."
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
"solcher existiert."
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3417,113 +3415,113 @@ msgstr ""
msgid "Execute external solver"
msgstr "Externen Problemlöser ausführen"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s wird installiert."
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s wird konfiguriert."
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s wird entfernt."
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s wird vollständig entfernt."
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Verschwinden von %s festgestellt"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Aufruf des Nach-Installations-Triggers %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Verzeichnis »%s« fehlt"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Datei »%s« konnte nicht geöffnet werden."
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s wird entpackt."
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Konfiguration von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s installiert"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Entfernen von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s entfernt"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Vollständiges Entfernen von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts "
"nicht eingebunden?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Ausführen von dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
"erreicht ist."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3531,7 +3529,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3547,7 +3545,16 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen erschöpftem Arbeitsspeicher hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"wegen voller Festplatte hindeutet."
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3583,6 +3590,78 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ 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."
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n"
+#~ "oder automatisch installiert zu markieren. Diese Markierungen können "
+#~ "auch\n"
+#~ "aufgelistet werden.\n"
+#~ "\n"
+#~ "Befehle:\n"
+#~ " auto – das angegebene Paket als »Automatisch installiert« markieren\n"
+#~ " manual – das angegebene Paket als »Manuell installiert« markieren\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ " -h dieser Hilfetext\n"
+#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+#~ " -qq keine Ausgabe, außer bei Fehlern\n"
+#~ " -s nichts tun, nur eine Simulation der Aktionen durchführen\n"
+#~ " -f Autom./Manuell-Markierung in der angegebenen Datei lesen/"
+#~ "schreiben\n"
+#~ " -c=? Diese Konfigurationsdatei benutzen\n"
+#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
+#~ "weitergehender Informationen und Optionen."
+
+#~ 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 ""
+#~ "Aufruf: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
+#~ "Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
+#~ "Fehlersuche oder ähnlichem.\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ " -h dieser Hilfetext\n"
+#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+#~ " -c=? Diese Konfigurationsdatei benutzen\n"
+#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s konnte nicht entfernt werden."
diff --git a/po/dz.po b/po/dz.po
index 6f815804c..2ed296324 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -115,7 +115,7 @@ msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -300,7 +300,7 @@ msgstr "ཝའི།"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -605,8 +605,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
@@ -643,7 +643,7 @@ msgstr "བར་བཤོལ་འབད།"
msgid "Do you want to continue [Y/n]? "
msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -652,7 +652,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ
msgid "Some files failed to download"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
@@ -842,33 +842,28 @@ msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མ
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -876,106 +871,106 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -984,37 +979,37 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1103,7 +1098,7 @@ msgstr ""
"ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1174,7 +1169,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1198,7 +1193,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1575,8 +1570,8 @@ msgstr "ནང་འཁོད་འཛོལ་བ།"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -2023,11 +2018,10 @@ msgid "Failed to rename %s to %s"
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2035,17 +2029,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
-"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
-"གདམ་ཁ་ཚུ།\n"
-" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-" -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
-" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
-"བཟུམ།\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2265,26 +2251,26 @@ msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2841,12 +2827,12 @@ msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦ
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
@@ -2939,7 +2925,7 @@ msgid "Couldn't stat source package list %s"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
@@ -2947,7 +2933,7 @@ msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་
msgid "Collecting File Provides"
msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
@@ -3201,49 +3187,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3268,115 +3254,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3388,7 +3374,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3417,6 +3409,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+#~ "རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+#~ "གདམ་ཁ་ཚུ།\n"
+#~ " -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+#~ " -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+#~ " -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+#~ " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/"
+#~ "tmp་བཟུམ།\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
diff --git a/po/el.po b/po/el.po
index 62bb87650..99456f2d8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -121,7 +121,7 @@ msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Αδυναμία εντοπισμού του πακέτου %s"
@@ -166,7 +166,7 @@ msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -308,7 +308,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -616,8 +616,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -654,7 +654,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -663,7 +663,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -864,35 +864,30 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -900,86 +895,86 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -987,7 +982,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -995,14 +990,14 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1011,7 +1006,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1019,30 +1014,30 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Σύνδεση στο %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1127,7 +1122,7 @@ msgstr ""
"για περισσότερες πληροφορίες και επιλογές.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1198,7 +1193,7 @@ msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -1222,7 +1217,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1601,8 +1596,8 @@ msgstr "Εσωτερικό Σφάλμα"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
@@ -2049,11 +2044,10 @@ msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2061,17 +2055,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
-"\n"
-"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
-"και πρότυπα από πακέτα debian\n"
-"\n"
-"Επιλογές:\n"
-" -h Το παρόν κείμενο βοήθειας\n"
-" -t Καθορισμός προσωρινού καταλόγου\n"
-" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2291,26 +2277,26 @@ msgstr "Αδύνατη η εκτέλεση"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Αποτυχία εγγραφής του αρχείου %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2873,12 +2859,12 @@ msgstr ""
"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
"enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -2976,7 +2962,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
@@ -2984,7 +2970,7 @@ msgstr "Ανάγνωση Λιστών Πακέτων"
msgid "Collecting File Provides"
msgstr "Συλλογή Παροχών Αρχείου"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
@@ -3237,49 +3223,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Εγκατάλειψη της εγκατάστασης."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3304,117 +3290,117 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Ρύθμιση του %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Αφαιρώ το %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Εκτέλεση του post-installation trigger %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Ο φάκελος %s αγνοείται."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Προετοιμασία του %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Ξεπακετάρισμα του %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Έγινε εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Προετοιμασία για την αφαίρεση του %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Αφαίρεσα το %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
"προσαρτημένο το /dev/pts;)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3426,7 +3412,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3455,6 +3447,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
+#~ "\n"
+#~ "το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+#~ "και πρότυπα από πακέτα debian\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ " -h Το παρόν κείμενο βοήθειας\n"
+#~ " -t Καθορισμός προσωρινού καταλόγου\n"
+#~ " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+#~ " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Αποτυχία διαγραφής του %s"
diff --git a/po/es.po b/po/es.po
index 11295cdae..b80fa0ed2 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -165,7 +165,7 @@ msgstr "Debe proporcionar al menos un patrón de búsqueda"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "No se ha podido localizar el paquete %s"
@@ -210,7 +210,7 @@ msgid " Version table:"
msgstr " Tabla de versión:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -354,7 +354,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -657,8 +657,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Se liberarán %sB después de esta operación.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -695,7 +695,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -704,7 +704,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "No se pudieron descargar algunos archivos"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de sólo descarga"
@@ -907,26 +907,21 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su código fuente"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -936,7 +931,7 @@ msgstr ""
"versiones «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -948,87 +943,87 @@ msgstr ""
"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
"del paquete.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitiendo el fichero ya descargado «%s»\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento «%s».\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción «%s».\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus dependencias de "
"construcción"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener información de dependencias de construcción para %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1037,7 +1032,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1046,14 +1041,14 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1062,7 +1057,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versión "
"disponible del paquete %s satisface los requisitos de versión"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1071,30 +1066,30 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectando a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1185,7 +1180,7 @@ msgstr ""
"para más información y opciones.\n"
" Este APT tiene poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1260,7 +1255,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -1284,7 +1279,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1660,8 +1655,8 @@ msgstr "Error interno"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -2113,11 +2108,10 @@ msgid "Failed to rename %s to %s"
msgstr "Falló el renombre de %s a %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2125,18 +2119,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
-"\n"
-"apt-extracttemplates es una herramienta para extraer información de\n"
-"configuración y plantillas de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-" -h Este texto de ayuda.\n"
-" -t Define el directorio temporal\n"
-" -c=? Lee este archivo de configuración\n"
-" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
-"cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2354,11 +2339,11 @@ msgstr "No pude sincronizar «mmap»"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Falló al truncar el archivo"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2367,7 +2352,7 @@ msgstr ""
"La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
"valor de «APT::Cache-Limit». El valor actual es: %lu (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2376,7 +2361,7 @@ msgstr ""
"No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el "
"límite de %lu bytes."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2949,12 +2934,12 @@ msgstr "El método %s no se inició correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y pulse Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "No está soportado el sistema de paquetes «%s»"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -3053,7 +3038,7 @@ msgid "Couldn't stat source package list %s"
msgstr "No se puede leer la lista de paquetes fuente %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Leyendo lista de paquetes"
@@ -3061,7 +3046,7 @@ msgstr "Leyendo lista de paquetes"
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando caché fuente"
@@ -3323,34 +3308,34 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "No se instaló ningún anillo de claves %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontró la Distribución «%s» para «%s»"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontró la versión «%s» para «%s»"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No se pudo encontrar la tarea «%s»"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3359,21 +3344,21 @@ msgstr ""
"No se puede seleccionar una versión instalada o candidata para el paquete "
"«%s» dado que éste no tiene ninguna de éstas"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No se puede seleccionar la última versión del paquete «%s» dado que es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"No se puede seleccionar una versión candidata del paquete %s dado que no "
"tiene candidatos"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3400,113 +3385,113 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Borrando completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Se detectó la desaparición de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Ejecutando disparador post-instalación %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta el directorio «%s»."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "No pude abrir el fichero «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose para eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s eliminado"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose para eliminar completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No pudo escribirse el registro, falló la llamada a openpty() (¿está montado "
"«/dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Ejecutando dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
"«MaxReports»"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - dejando sin instalar"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3514,7 +3499,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que es "
"un mensaje de error asociado a un fallo previo."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3530,7 +3515,16 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica un "
"error de memoria excedida"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica que el "
+"error es de disco lleno"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3565,6 +3559,31 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
+#, fuzzy
+#~ 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 ""
+#~ "Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates es una herramienta para extraer información de\n"
+#~ "configuración y plantillas de paquetes de debian.\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ " -h Este texto de ayuda.\n"
+#~ " -t Define el directorio temporal\n"
+#~ " -c=? Lee este archivo de configuración\n"
+#~ " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+#~ "cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "No pude borrar %s"
diff --git a/po/eu.po b/po/eu.po
index 3d3a15b46..8fb3553de 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -112,7 +112,7 @@ msgstr "Zehazki eredu bat eman behar duzu."
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Ezin da %s paketea lokalizatu"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -296,7 +296,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -595,8 +595,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -633,7 +633,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -642,7 +642,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -843,33 +843,28 @@ msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -877,87 +872,87 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -965,7 +960,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -973,14 +968,14 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -989,7 +984,7 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -997,30 +992,30 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1107,7 +1102,7 @@ msgstr ""
"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
" APT honek Super Behiaren Ahalmenak ditu.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1178,7 +1173,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -1202,7 +1197,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1581,8 +1576,8 @@ msgstr "Barne errorea"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -2022,11 +2017,10 @@ msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2034,17 +2028,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
-"\n"
-"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
-"informazioa ateratzeko tresna bat da\n"
-"\n"
-"Aukerak:\n"
-" -h Laguntza testu hau\n"
-" -t Ezarri aldi baterako direktorioa\n"
-" -c=? Irakurri konfigurazio fitxategi hau\n"
-" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2263,11 +2249,11 @@ msgstr "Ezin da deitu "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Huts fitxategia mozterakoan"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2276,14 +2262,14 @@ msgstr ""
"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
"balioa: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2841,12 +2827,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete sistema ez da onartzen"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
@@ -2937,7 +2923,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Pakete Zerrenda irakurtzen"
@@ -2945,7 +2931,7 @@ msgstr "Pakete Zerrenda irakurtzen"
msgid "Collecting File Provides"
msgstr "Fitxategiaren erreferentziak biltzen"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu katxea gordetzean"
@@ -3199,49 +3185,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Abortatu instalazioa."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3266,117 +3252,117 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s Instalatzen"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s konfiguratzen"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s kentzen"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' direktorioa falta da"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s fitxategia ezin izan da ireki"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s irekitzen"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfiguratzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s Instalatuta"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s kentzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s kendurik"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s guztiz ezabatzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
"muntaturik?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3388,7 +3374,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3417,6 +3409,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates debian-eko paketeen konfigurazioaren eta "
+#~ "txantiloien\n"
+#~ "informazioa ateratzeko tresna bat da\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ " -h Laguntza testu hau\n"
+#~ " -t Ezarri aldi baterako direktorioa\n"
+#~ " -c=? Irakurri konfigurazio fitxategi hau\n"
+#~ " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Huts egin du %s kentzean"
diff --git a/po/fi.po b/po/fi.po
index f0f9a97c6..dbd70495d 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -112,7 +112,7 @@ msgstr "On annettava täsmälleen yksi lauseke"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakettia %s ei löydy"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -293,7 +293,7 @@ msgstr "K"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -591,8 +591,8 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -630,7 +630,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -639,7 +639,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -840,33 +840,28 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain"
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -874,86 +869,86 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -961,7 +956,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -969,14 +964,14 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -985,7 +980,7 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -993,30 +988,30 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1102,7 +1097,7 @@ msgstr ""
"lisätietoja ja lisää valitsimia.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1173,7 +1168,7 @@ msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -1197,7 +1192,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1573,8 +1568,8 @@ msgstr "Sisäinen virhe"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -2019,11 +2014,10 @@ msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2031,17 +2025,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
-"poimintaan debian-paketeista\n"
-"\n"
-"Valitsimet:\n"
-" -h Tämä ohje\n"
-" -t Aseta väliaikaisten tiedostojen kansio\n"
-" -c=? Lue tämä asetustiedosto\n"
-" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2261,25 +2247,25 @@ msgstr "Käynnistys ei onnistu"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Tiedoston typistäminen ei onnistunut"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2831,12 +2817,12 @@ msgstr "Menetelmä %s ei käynnistynyt oikein"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2929,7 +2915,7 @@ msgid "Couldn't stat source package list %s"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Luetaan pakettiluetteloita"
@@ -2937,7 +2923,7 @@ msgstr "Luetaan pakettiluetteloita"
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
@@ -3192,49 +3178,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Asennus keskeytetään."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Tehtävää %s ei löytynyt"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3259,117 +3245,117 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Asennetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Tehdään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Poistetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Suoritetaan jälkiasennusliipaisin %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Kansio \"%s\" puuttuu."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Tiedostoa %s ei voitu avata"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Valmistellaan %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Puretaan %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Valmistaudutaan tekemään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s asennettu"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Valmistaudutaan poistamaan %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s poistettu"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Valmistaudutaan poistamaan %s kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
"liittämättä?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3381,7 +3367,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3410,6 +3402,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+#~ "poimintaan debian-paketeista\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ " -h Tämä ohje\n"
+#~ " -t Aseta väliaikaisten tiedostojen kansio\n"
+#~ " -c=? Lue tämä asetustiedosto\n"
+#~ " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Tiedoston %s poistaminen ei onnistunut"
diff --git a/po/fr.po b/po/fr.po
index b20036cbe..8c1ec034c 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-25 19:58+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -111,7 +111,7 @@ msgstr "Vous devez fournir au moins un motif de recherche"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossible de trouver le paquet %s"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " Table de version :"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -297,7 +297,7 @@ msgstr "O"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -604,8 +604,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
@@ -646,7 +646,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
@@ -655,7 +655,7 @@ msgstr "Impossible de récupérer %s %s\n"
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu être téléchargés."
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
@@ -867,28 +867,21 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:2386
-#, 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 »"
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Téléchargement de %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -898,7 +891,7 @@ msgstr ""
"suivi de versions « %s » à l'adresse :\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -910,70 +903,70 @@ msgstr ""
"pour récupérer les dernières mises à jour (éventuellement non encore "
"publiées) du paquet.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nécessité de prendre %so/%so dans les sources.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nécessité de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
"construction"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -983,17 +976,17 @@ msgstr ""
"consulter la section à propos de APT::Architectures dans la page de manuel "
"apt.conf(5)."
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1002,7 +995,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
"autorisé avec les paquets « %s »."
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1011,14 +1004,14 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
"peut être trouvé"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
"est trop récent"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1027,7 +1020,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
"disponible du paquet %s ne peut satisfaire les prérequis de version."
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1036,31 +1029,31 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
"n'a pas de version disponible."
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Journal des modifications pour %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1150,7 +1143,7 @@ msgstr ""
"apt.conf(5) pour plus d'informations et d'options.\n"
" Cet APT a les « Super Cow Powers »\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1227,7 +1220,7 @@ msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -1253,7 +1246,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1269,28 +1262,6 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-"Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n"
-"\n"
-"apt-mark est une interface simple, en ligne de commande, qui permet\n"
-"de marquer des paquets comme installés manuellement ou automatiquement.\n"
-"Cette commande permet également d'afficher cet état.\n"
-"\n"
-"Commandes :\n"
-" auto - marquer les paquets indiqués comme installés automatiquement\n"
-" manual - marquer les paquets indiqués comme installés manuellement\n"
-"\n"
-"Options:\n"
-" -h Affiche la présente aide.\n"
-" -q Affichage journalisable - pas de barre de progression\n"
-" -qq Pas d'affichage à part les erreurs\n"
-" -s Mode simulation : aucune action effectuée.\n"
-" Affiche simplement ce qui serait effectué.\n"
-" -f lecture/écriture des états dans le fichier indiqué\n"
-" -c=? lecture du fichier de configuration indiqué\n"
-" -o=? utilisation d'une option de configuration,\n"
-" p. ex. -o dir::cache=/tmp\n"
-"Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
-"pour plus d'informations."
#: methods/cdrom.cc:203
#, c-format
@@ -1658,8 +1629,8 @@ msgstr "Erreur interne"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -2110,9 +2081,9 @@ msgstr "Impossible de changer le nom %s en %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2120,20 +2091,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Utilisation: apt-internal-solver\n"
-"\n"
-"apt-internal-solver est une interface en ligne de commande\n"
-"permettant d'utiliser la résolution interne d'apt de manière externe\n"
-"avec les outils de la famille d'APT à des fins de déboguage ou\n"
-"équivalent.\n"
-"\n"
-"Options:\n"
-" -h La présente aide.\n"
-" -q Affichage journalisable - pas de barre de progression\n"
-" -c=? lecture du fichier de configuration indiqué\n"
-" -o=? utilisation d'une option de configuration,\n"
-" p. ex. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2352,11 +2312,11 @@ msgstr "Impossible de synchroniser la « mmap »"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Échec de la troncature du fichier"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2366,7 +2326,7 @@ msgstr ""
"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
"actuelle est de %lu (voir « man 5 apt.conf »)."
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2375,7 +2335,7 @@ msgstr ""
"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
"est déjà atteinte."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2960,12 +2920,12 @@ msgstr ""
"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
"touche Entrée."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le système de paquet « %s » n'est pas supporté"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de déterminer un type du système de paquets adéquat"
@@ -3073,7 +3033,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Impossible de localiser la liste des paquets sources %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lecture des listes de paquets"
@@ -3081,7 +3041,7 @@ msgstr "Lecture des listes de paquets"
msgid "Collecting File Provides"
msgstr "Assemblage des fichiers listés dans les champs Provides"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
@@ -3348,36 +3308,36 @@ msgstr "Le fichier %s ne commence pas par un message signé en clair."
msgid "No keyring installed in %s."
msgstr "Pas de porte-clés installé dans %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » est introuvable"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » n'a pu être trouvée"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossible de trouver la tâche « %s »"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
"virtuel"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3386,20 +3346,20 @@ msgstr ""
"Impossible de choisir une version installée ou candidate du paquet « %s » "
"qui n'en n'a aucune"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
"paquet virtuel"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3426,111 +3386,111 @@ msgstr "Échec du solveur externe sans message d'erreur adapté"
msgid "Execute external solver"
msgstr "Exécu tion du solveur externe"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installation de %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Disparition de %s constatée"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Exécution des actions différées (« trigger ») de %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Répertoire %s inexistant"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossible d'ouvrir le fichier « %s »"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Préparation de %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Décompression de %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Préparation de la configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s installé"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Préparation de la suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s supprimé"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Préparation de la suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossible d'écrire le journal, échec d'openpty()\n"
"(/dev/pts est-il monté ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Exécution de dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "L'opération a été interrompue avant de se terminer"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problème de dépendances : laissé non configuré"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3538,7 +3498,7 @@ msgstr ""
"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
"erreur consécutive à un échec précédent."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3553,7 +3513,15 @@ msgstr ""
"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
"mémoire a été signalée"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3590,6 +3558,80 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ 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 »"
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n"
+#~ "\n"
+#~ "apt-mark est une interface simple, en ligne de commande, qui permet\n"
+#~ "de marquer des paquets comme installés manuellement ou automatiquement.\n"
+#~ "Cette commande permet également d'afficher cet état.\n"
+#~ "\n"
+#~ "Commandes :\n"
+#~ " auto - marquer les paquets indiqués comme installés automatiquement\n"
+#~ " manual - marquer les paquets indiqués comme installés manuellement\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h Affiche la présente aide.\n"
+#~ " -q Affichage journalisable - pas de barre de progression\n"
+#~ " -qq Pas d'affichage à part les erreurs\n"
+#~ " -s Mode simulation : aucune action effectuée.\n"
+#~ " Affiche simplement ce qui serait effectué.\n"
+#~ " -f lecture/écriture des états dans le fichier indiqué\n"
+#~ " -c=? lecture du fichier de configuration indiqué\n"
+#~ " -o=? utilisation d'une option de configuration,\n"
+#~ " p. ex. -o dir::cache=/tmp\n"
+#~ "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n"
+#~ "pour plus d'informations."
+
+#~ 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 ""
+#~ "Utilisation: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver est une interface en ligne de commande\n"
+#~ "permettant d'utiliser la résolution interne d'apt de manière externe\n"
+#~ "avec les outils de la famille d'APT à des fins de déboguage ou\n"
+#~ "équivalent.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h La présente aide.\n"
+#~ " -q Affichage journalisable - pas de barre de progression\n"
+#~ " -c=? lecture du fichier de configuration indiqué\n"
+#~ " -o=? utilisation d'une option de configuration,\n"
+#~ " p. ex. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Impossible de supprimer %s"
diff --git a/po/gl.po b/po/gl.po
index 574e44c5a..755cc24c9 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -114,7 +114,7 @@ msgstr "Debe fornecer cando menos un patrón de busca"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Non foi posíbel atopar o paquete %s"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -299,7 +299,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -599,8 +599,8 @@ msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non foi posíbel determinar o espazo libre en %s"
@@ -637,7 +637,7 @@ msgstr "Interromper."
msgid "Do you want to continue [Y/n]? "
msgstr "Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
@@ -646,7 +646,7 @@ msgstr "Non foi posíbel obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non foi posíbel descargar algúns ficheiros"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -850,26 +850,21 @@ msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
msgid "Unable to lock the download directory"
msgstr "Non é posíbel bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Descargando %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non sé posíbel atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -878,7 +873,7 @@ msgstr ""
"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -890,87 +885,87 @@ msgstr ""
"para obter as últimas actualizacións (posibelmente non publicadas) do "
"paquete.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado «%s»\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre abondo en %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ten que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Non se puideron obter algúns arquivos."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetado «%s».\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a orde de construción de «%s».\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar polo menos un paquete para comprobarlle as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -979,7 +974,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -988,14 +983,14 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
"é novo de máis"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1004,7 +999,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
"dispoñíbel do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1008,30 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de construción de %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Non se puideron procesar as dependencias de construción"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Rexistro de cambios de %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1129,7 +1124,7 @@ msgstr ""
"para obter mais información e opcións\n"
" Este APT ten poderes da Super Vaca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1205,7 +1200,7 @@ msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -1229,7 +1224,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1609,8 +1604,8 @@ msgstr "Produciuse un erro interno"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Non é posíbel ler %s"
@@ -2057,11 +2052,10 @@ msgid "Failed to rename %s to %s"
msgstr "Non foi posíbel cambiar o nome de %s a %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2069,18 +2063,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
-"\n"
-"apt-extracttemplates é unha ferramenta para extraer información\n"
-"de configuración e patróns dos paquetes debian\n"
-"\n"
-"Opcións:\n"
-" -h Este texto de axuda\n"
-" -t Estabelece o directorio temporal\n"
-" -c=? Le este ficheiro de configuración\n"
-" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2298,11 +2283,11 @@ msgstr "Non é posíbel sincronizar mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Non foi posíbel facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Non foi posíbel truncar o ficheiro"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2311,7 +2296,7 @@ msgstr ""
"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
"Limit. O valor actual é : %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2320,7 +2305,7 @@ msgstr ""
"Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi "
"acadado."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2890,12 +2875,12 @@ msgstr "O método %s non se iniciou correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "O sistema de empaquetado «%s» non está admitido"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado"
@@ -2993,7 +2978,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lendo as listas de paquetes"
@@ -3001,7 +2986,7 @@ msgstr "Lendo as listas de paquetes"
msgid "Collecting File Provides"
msgstr "Recollendo as provisións de ficheiros"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
@@ -3264,34 +3249,34 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Non ha ningún chaveiro instalado en %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non se atopou a publicación «%s» de «%s»"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non se atopou a versión «%s» de «%s»"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Non foi posíbel atopar a tarefa «%s»"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3300,21 +3285,21 @@ msgstr ""
"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
"«%s» xa que non ten ningunha delas"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
"candidata"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3341,113 +3326,113 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Retirando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s completamente retirado"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Tomando nota da desaparición de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando o disparador de post-instalación %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta o directorio «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Non foi posíbel abrir o ficheiro «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparandose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Instalouse %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose para o retirado de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Retirouse %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose para retirar %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Retirouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Non foi posíbel escribir no rexistro, a chamada a openpty() fallou (/dev/pts "
"non estaba montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Executando dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
"MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - déixase sen configurar"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3455,7 +3440,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
"é un error provinte dun fallo anterior."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3471,7 +3456,16 @@ msgstr ""
"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
"un erro de falta de memoria"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de disco cheo."
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3507,6 +3501,31 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#, fuzzy
+#~ 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 ""
+#~ "Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates é unha ferramenta para extraer información\n"
+#~ "de configuración e patróns dos paquetes debian\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ " -h Este texto de axuda\n"
+#~ " -t Estabelece o directorio temporal\n"
+#~ " -c=? Le este ficheiro de configuración\n"
+#~ " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::"
+#~ "cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Non foi posíbel retirar %s"
diff --git a/po/hu.po b/po/hu.po
index f25d00c12..c7d81e592 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -113,7 +113,7 @@ msgstr "Legalább egy keresési mintát meg kell adnia"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Ez a csomag nem található: %s"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "I"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -588,8 +588,8 @@ msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "A művelet után %sB lemezterület szabadul fel.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
@@ -626,7 +626,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarja [I/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -635,7 +635,7 @@ msgstr "Sikertelen letöltés: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a „csak letöltés” módban"
@@ -840,27 +840,22 @@ msgstr "Belső hiba, a problémamegoldó hibát okozott"
msgid "Unable to lock the download directory"
msgstr "Nem lehet zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:2386
-#, 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"
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Letöltés: %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -870,7 +865,7 @@ msgstr ""
"karbantartva:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -881,70 +876,70 @@ msgstr ""
"bzr branch %s\n"
"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött „%s” fájl kihagyása\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "„%s” kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "„%s” elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -953,17 +948,17 @@ msgstr ""
"Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
"kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -972,7 +967,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
"engedélyezett a(z) „%4$s” csomagokon"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -981,14 +976,14 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
"található"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
"friss"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -997,7 +992,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
"verziója nem elégíti ki a verziókövetelményeket"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1006,30 +1001,30 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
"jelölt verziója"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetők ki."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Változási napló ehhez: %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1118,7 +1113,7 @@ msgstr ""
"információkért és opciókért.\n"
" Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1193,7 +1188,7 @@ msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
@@ -1217,7 +1212,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1233,7 +1228,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-"Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n"
+"Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 …]\n"
"\n"
"Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n"
"kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket "
@@ -1615,8 +1610,8 @@ msgstr "Belső hiba"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
@@ -2062,9 +2057,9 @@ msgstr "„%s” átnevezése sikertelen erre: %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2072,10 +2067,12 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Használat: apt-internal-solver\n"
+"Használat: apt-internal-resolver\n"
"\n"
-"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
+"Az apt-internal-resolver felülettel a jelenlegi belső feloldó külső\n"
"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
"\n"
"Kapcsolók:\n"
@@ -2084,6 +2081,10 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
"tmp\n"
+"Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat "
+"további\n"
+"információkért és opciókért.\n"
+" Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2301,11 +2302,11 @@ msgstr "Nem lehet szinkronizálni az mmapot"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "A fájl csonkítása meghiúsult"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2314,7 +2315,7 @@ msgstr ""
"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Limit méretét. A "
"jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2322,7 +2323,7 @@ msgid ""
msgstr ""
"Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2897,12 +2898,12 @@ msgstr ""
"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
"Entert."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) „%s” csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszertípus nem határozható meg"
@@ -2999,7 +3000,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Csomaglisták olvasása"
@@ -3008,7 +3009,7 @@ msgstr "Csomaglisták olvasása"
msgid "Collecting File Provides"
msgstr "„Biztosítja” kapcsolatok összegyűjtése"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
@@ -3268,32 +3269,32 @@ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
msgid "No keyring installed in %s."
msgstr "Nincs kulcstartó telepítve ide: %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "„%s” kiadás nem található ehhez: „%s”"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "„%s” verzió nem található ehhez: „%s”"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "„%s” feladat nem található"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3302,19 +3303,19 @@ msgstr ""
"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
"mert egyikkel sem rendelkezik"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3340,110 +3341,110 @@ msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
msgid "Execute external solver"
msgstr "Külső solver végrehajtása"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s telepítése"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s konfigurálása"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s teljes eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "„%s” eltűnése feljegyezve"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A(z) %s telepítés utáni trigger futtatása"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "A(z) „%s” könyvtár hiányzik"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "A(z) „%s” fájl megnyitása sikertelen"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s kicsomagolása"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfigurálásának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s telepítve"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s teljes eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nem írható a napló, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "A dpkg futtatása"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "függőségi hibák - a csomag beállítatlan maradt"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3451,7 +3452,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
"egy korábbi hiba következménye."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3467,7 +3468,15 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
"hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
+"lévő hibát jelez"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3502,6 +3511,76 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ 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"
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n"
+#~ "\n"
+#~ "Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n"
+#~ "kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket "
+#~ "is.\n"
+#~ "\n"
+#~ "Parancsok:\n"
+#~ " auto -Az adott csomagok megjelölése automatikusan telepítettként\n"
+#~ " manual - Az adott csomagok megjelölése kézzel telepítettként\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ " -h Ez a súgó szöveg.\n"
+#~ " -q Naplózható kimenet - nincs folyamatjelző\n"
+#~ " -qq Nincs kimenet, kivéve a hibákat\n"
+#~ " -s Szimulációs mód. Csak kiírja, mi történne.\n"
+#~ " -f auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
+#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+#~ "tmp\n"
+#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
+#~ "információkért."
+
+#~ 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 ""
+#~ "Használat: apt-internal-solver\n"
+#~ "\n"
+#~ "Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
+#~ "feloldóként használható az APT családhoz hibakeresési vagy hasonló "
+#~ "céllal\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ " -h Ez a súgó szöveg.\n"
+#~ " -q Naplózható kimenet - nincs folyamatjelző\n"
+#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n"
+#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s eltávolítása sikertelen"
@@ -3635,10 +3714,3 @@ msgstr "Nincs zárolva"
#~ msgid "Error occurred while processing %s (CollectFileProvides)"
#~ msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
-
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
-#~ "lévő hibát jelez"
diff --git a/po/it.po b/po/it.po
index d616c84a9..aea198ba5 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-25 21:54+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -113,7 +113,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossibile trovare il pacchetto %s"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Tabella versione:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -295,7 +295,7 @@ msgstr "S"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -601,8 +601,8 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero in %s"
@@ -641,7 +641,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
@@ -650,7 +650,7 @@ msgstr "Impossibile recuperare %s %s\n"
msgid "Some files failed to download"
msgstr "Scaricamento di alcuni file non riuscito"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
@@ -856,28 +856,22 @@ msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:2386
-#, 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\""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Scaricamento di %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -887,7 +881,7 @@ msgstr ""
"all'interno del sistema di controllo della versione \"%s\" presso:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -899,70 +893,70 @@ msgstr ""
"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
"pacchetto.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s è insufficiente"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario scaricare %sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui controllare le "
"dipendenze di generazione"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -971,17 +965,17 @@ msgstr ""
"Informazioni sull'architettura non disponibili per %s. Consultare apt.conf"
"(5) APT::Architectures per l'impostazione"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -990,7 +984,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
"consentito su pacchetti \"%s\""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -999,14 +993,14 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
"è troppo recente"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1015,7 +1009,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché la versione "
"candidata del pacchetto %s non può soddisfare i requisiti di versione"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1024,30 +1018,30 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
"non ha una versione candidata"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1137,7 +1131,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5).\n"
" Questo APT ha i poteri della Super Mucca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1213,7 +1207,7 @@ msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -1237,7 +1231,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1253,27 +1247,6 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-"Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
-"\n"
-"apt-mark è una semplice interfaccia a riga di comando per segnalare i "
-"pacchetti\n"
-"come installati manualmente o automaticamente. Può anche elencare le \n"
-"segnalazioni.\n"
-"\n"
-"Comandi:\n"
-" auto Segna i pacchetti forniti come installati automaticamente\n"
-" manual Segna i pacchetti forniti come installati manualmente\n"
-"\n"
-"Opzioni:\n"
-" -h Mostra questo aiuto\n"
-" -q Output registrabile, nessun indicatore di avanzamento\n"
-" -qq Nessun output eccetto gli errori\n"
-" -s Nessuna azione, stampa solamente cosa verrebbe fatto\n"
-" -f Legge/Scrivere la segnalazione nel file fornito\n"
-" -c=? Legge come configurazione il file specificato\n"
-" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
-"Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
-"apt.conf(5)."
#: methods/cdrom.cc:203
#, c-format
@@ -1638,8 +1611,8 @@ msgstr "Errore interno"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -2091,9 +2064,9 @@ msgstr "Rinomina di %s in %s non riuscita"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2101,17 +2074,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-internal-solver\n"
-"\n"
-"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
-"come resolver esterno per il debugging degli strumenti APT\n"
-"\n"
-"Opzioni:\n"
-" -h Mostra questo aiuto\n"
-" -q Output registrabile, nessun indicatore di avanzamento\n"
-" -c=? Legge come configurazione il file specificato\n"
-" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2329,11 +2294,11 @@ msgstr "Impossibile sincronizzare mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossibile eseguire mmap di %lu byte"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Troncamento del file non riuscito"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2342,7 +2307,7 @@ msgstr ""
"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
"valore attuale è: %lu (man 5 apt.conf)."
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2352,7 +2317,7 @@ msgstr ""
"byte è stato raggiunto."
# (ndt) lunghetta...
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2936,12 +2901,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -3043,7 +3008,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lettura elenco dei pacchetti"
@@ -3052,7 +3017,7 @@ msgstr "Lettura elenco dei pacchetti"
msgid "Collecting File Provides"
msgstr "Il file fornisce"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvare la cache sorgente"
@@ -3317,35 +3282,35 @@ msgid "No keyring installed in %s."
msgstr "Nessun portachiavi installato in %s."
# (ndt) dovrebbe essere inteso il file Release
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release \"%s\" per \"%s\" non trovato."
# (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" per \"%s\" non trovato"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossibile trovare il task \"%s\""
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3354,21 +3319,21 @@ msgstr ""
"Impossibile selezionare la versione installata o la candidata dal pacchetto "
"\"%s\" poiché non sono presenti"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
"è virtuale"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
"alcun candidato"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3395,113 +3360,113 @@ msgstr "Il solver esterno è terminato senza un errore di messaggio"
msgid "Execute external solver"
msgstr "Esecuzione solver esterno"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Notata la sparizione di %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Esecuzione comando di post installazione %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory \"%s\" mancante"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossibile aprire il file \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Estrazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Pacchetto %s installato"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione alla rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pacchetto %s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
"è montato)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Esecuzione di dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "L'operazione è stata interrotta prima di essere completata"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
"di MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3509,7 +3474,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica la "
"presenza di un fallimento precedente."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3525,7 +3490,15 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore di memoria esaurita"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Non è stata scritta alcuna segnalazione di apport poiché il messaggio di "
+"errore indica la presenza di un problema nel sistema locale"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3562,6 +3535,76 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ msgid "Can't find a source to download version '%s' of '%s'"
+#~ msgstr ""
+#~ "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s"
+#~ "\""
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
+#~ "\n"
+#~ "apt-mark è una semplice interfaccia a riga di comando per segnalare i "
+#~ "pacchetti\n"
+#~ "come installati manualmente o automaticamente. Può anche elencare le \n"
+#~ "segnalazioni.\n"
+#~ "\n"
+#~ "Comandi:\n"
+#~ " auto Segna i pacchetti forniti come installati automaticamente\n"
+#~ " manual Segna i pacchetti forniti come installati manualmente\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ " -h Mostra questo aiuto\n"
+#~ " -q Output registrabile, nessun indicatore di avanzamento\n"
+#~ " -qq Nessun output eccetto gli errori\n"
+#~ " -s Nessuna azione, stampa solamente cosa verrebbe fatto\n"
+#~ " -f Legge/Scrivere la segnalazione nel file fornito\n"
+#~ " -c=? Legge come configurazione il file specificato\n"
+#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
+#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
+#~ "apt.conf(5)."
+
+#~ 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 ""
+#~ "Uso: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
+#~ "come resolver esterno per il debugging degli strumenti APT\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ " -h Mostra questo aiuto\n"
+#~ " -q Output registrabile, nessun indicatore di avanzamento\n"
+#~ " -c=? Legge come configurazione il file specificato\n"
+#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Rimozione di %s non riuscita"
@@ -3637,13 +3680,6 @@ msgstr "Non bloccato"
#~ msgid "Got a single header line over %u chars"
#~ msgstr "Ricevuta una singola riga header su %u caratteri"
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Non è stata scritta alcuna segnalazione di apport poiché il messaggio di "
-#~ "errore indica la presenza di un problema nel sistema locale"
-
#~ msgid "Malformed override %s line %lu #1"
#~ msgstr "Override non corretto: file %s riga %lu #1"
diff --git a/po/ja.po b/po/ja.po
index 95aca1619..df0ad0eb1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-08-25 09:33+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -110,7 +110,7 @@ msgstr "検索パターンはちょうど 1 つだけ指定してください"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "パッケージ %s が見つかりません"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -293,7 +293,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -596,8 +596,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "この操作後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -634,7 +634,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -643,7 +643,7 @@ msgstr "%s の取得に失敗しました %s\n"
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -848,27 +848,22 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました"
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -878,7 +873,7 @@ msgstr ""
"ます:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -890,87 +885,87 @@ msgstr ""
"bzr get %s\n"
"を使用してください。\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -979,7 +974,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -988,14 +983,14 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1004,7 +999,7 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1008,30 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) へ接続しています"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1131,7 +1126,7 @@ msgstr ""
"apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n"
" この APT は Super Cow Powers 化されています。\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1206,7 +1201,7 @@ msgid "%s was already not hold.\n"
msgstr "%s はすでに最新バージョンです。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -1230,7 +1225,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1603,8 +1598,8 @@ msgstr "内部エラー"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
@@ -2046,11 +2041,10 @@ msgid "Failed to rename %s to %s"
msgstr "%s を %s に名前変更できませんでした"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2058,17 +2052,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
-"\n"
-"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
-"抽出するためのツールです\n"
-"\n"
-"オプション:\n"
-" -h このヘルプを表示する\n"
-" -t 一時ディレクトリを指定する\n"
-" -c=? 指定した設定ファイルを読み込む\n"
-" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2287,11 +2273,11 @@ msgstr "mmap を同期できません"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu バイトの mmap ができませんでした"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "ファイルの切り詰めに失敗しました"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2300,14 +2286,14 @@ msgstr ""
"動的 MMap が範囲を越えました。APT::Cache-Limit の大きさを増やしてください。現"
"在値は %lu です (man 5 apt.conf を参照)。"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。"
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2872,12 +2858,12 @@ msgstr ""
"'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
"い。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "パッケージングシステム '%s' はサポートされていません"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "適切なパッケージシステムタイプを特定できません"
@@ -2974,7 +2960,7 @@ msgid "Couldn't stat source package list %s"
msgstr "ソースパッケージリスト %s の状態を取得できません"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "パッケージリストを読み込んでいます"
@@ -2982,7 +2968,7 @@ msgstr "パッケージリストを読み込んでいます"
msgid "Collecting File Provides"
msgstr "ファイル提供情報を収集しています"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
@@ -3243,32 +3229,32 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "%s にキーリングがインストールされていません。"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "タスク '%s' が見つかりません"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3277,18 +3263,18 @@ msgstr ""
"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
"ので選べません"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3315,111 +3301,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s をインストールしています"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s を設定しています"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s を削除しています"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s を完全に削除しています"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s の消失を記録しています"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "インストール後トリガ %s を実行しています"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "ディレクトリ '%s' が見つかりません"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "ファイル '%s' をオープンできませんでした"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s を展開しています"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s の設定を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s をインストールしました"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s の削除を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s を削除しました"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s を完全に削除する準備をしています"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
"い?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "dpkg を実行しています"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "依存関係の問題 - 未設定のままにしています"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3427,7 +3413,7 @@ msgstr ""
"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3443,7 +3429,16 @@ msgstr ""
"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
"込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
+"き込まれません。"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3479,6 +3474,30 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
+#, fuzzy
+#~ 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 ""
+#~ "使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
+#~ "抽出するためのツールです\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ " -h このヘルプを表示する\n"
+#~ " -t 一時ディレクトリを指定する\n"
+#~ " -c=? 指定した設定ファイルを読み込む\n"
+#~ " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s の削除に失敗しました"
diff --git a/po/km.po b/po/km.po
index 6c2ea5275..db3469f13 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -116,7 +116,7 @@ msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនា
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -298,7 +298,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -595,8 +595,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
@@ -633,7 +633,7 @@ msgstr "បោះបង់ ។"
msgid "Do you want to continue [Y/n]? "
msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -642,7 +642,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម
msgid "Some files failed to download"
msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
@@ -832,33 +832,28 @@ msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -866,104 +861,104 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -972,37 +967,37 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1087,7 +1082,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1153,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1182,7 +1177,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1553,8 +1548,8 @@ msgstr "កំហុស​ខាង​ក្នុង​"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -1994,11 +1989,10 @@ msgid "Failed to rename %s to %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2006,17 +2000,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
-"ពី​កញ្ចប់​​ដេបៀន \n"
-"\n"
-"ជម្រើស ៖ ​\n"
-" -h អត្ថបទ​ជំនួយ​\n"
-" -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
-" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
-" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2234,26 +2220,26 @@ msgstr "មិន​អាច​ហៅ​ "
msgid "Couldn't make mmap of %lu bytes"
msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2805,12 +2791,12 @@ msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចា
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
@@ -2902,7 +2888,7 @@ msgid "Couldn't stat source package list %s"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
@@ -2910,7 +2896,7 @@ msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
msgid "Collecting File Provides"
msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
@@ -3160,49 +3146,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3227,115 +3213,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "កំពុង​យក %s ចេញ"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "កំពុងរៀបចំ​ %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "កំពុង​ស្រាយ %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "បាន​យក %s ចេញ"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3347,7 +3333,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3376,6 +3368,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+#~ "ពី​កញ្ចប់​​ដេបៀន \n"
+#~ "\n"
+#~ "ជម្រើស ៖ ​\n"
+#~ " -h អត្ថបទ​ជំនួយ​\n"
+#~ " -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+#~ " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+#~ " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "បរាជ័យក្នុងការយក %s ចេញ"
diff --git a/po/ko.po b/po/ko.po
index 04565c043..ed424be9f 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -107,7 +107,7 @@ msgstr "최소 한 개의 검색어를 지정해야 합니다"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
@@ -151,7 +151,7 @@ msgid " Version table:"
msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -289,7 +289,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -589,8 +589,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -630,7 +630,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
@@ -639,7 +639,7 @@ msgstr "%s 파일을 받는데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는데 실패했습니다"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
@@ -829,26 +829,21 @@ msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉터리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -857,7 +852,7 @@ msgstr ""
"알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -868,85 +863,85 @@ msgstr ""
"다음과 같이 하십시오:\n"
"bzr get %s\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는데 실패했습니다."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -955,7 +950,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -964,14 +959,14 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -980,7 +975,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -989,30 +984,30 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1100,7 +1095,7 @@ msgstr ""
"apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
" 이 APT는 Super Cow Powers로 무장했습니다.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1175,7 +1170,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1199,7 +1194,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1571,8 +1566,8 @@ msgstr "내부 오류"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
@@ -2016,11 +2011,10 @@ msgid "Failed to rename %s to %s"
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2028,17 +2022,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
-"\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
-"도구입니다\n"
-"\n"
-"옵션:\n"
-" -h 이 도움말\n"
-" -t 임시 디렉토리 설정\n"
-" -c=? 설정 파일을 읽습니다\n"
-" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2255,11 +2241,11 @@ msgstr "mmap을 동기화할 수 없습니다"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "파일을 자르는데 실패했습니다"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2268,14 +2254,14 @@ msgstr ""
"동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현재 "
"값: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2833,12 +2819,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
@@ -2929,7 +2915,7 @@ msgid "Couldn't stat source package list %s"
msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "패키지 목록을 읽는 중입니다"
@@ -2937,7 +2923,7 @@ msgstr "패키지 목록을 읽는 중입니다"
msgid "Collecting File Provides"
msgstr "파일에서 제공하는 것을 모으는 중입니다"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
@@ -3191,32 +3177,32 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "%s에 키 모음을 설치하지 않았습니다."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "'%s' 작업을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3225,17 +3211,17 @@ msgstr ""
"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
"다."
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
@@ -3260,110 +3246,110 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s 설치하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s 설정 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s 패키지를 지우는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s 패키지를 완전히 지우는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s 사라짐 발견했습니다"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "설치 후 트리거 %s 실행하는 중입니다"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "디렉터리 '%s' 없습니다."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "'%s' 파일을 열 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s 준비 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s 푸는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s 패키지를 설정할 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s 설치"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s 패키지를 지울 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s 지움"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "dpkg 실행하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3371,7 +3357,7 @@ msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
"적인 오류입니다."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3384,7 +3370,15 @@ msgid ""
"error"
msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3417,6 +3411,30 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
+#, fuzzy
+#~ 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 ""
+#~ "사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+#~ "도구입니다\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ " -h 이 도움말\n"
+#~ " -t 임시 디렉토리 설정\n"
+#~ " -c=? 설정 파일을 읽습니다\n"
+#~ " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s을(를) 지우는데 실패했습니다"
diff --git a/po/ku.po b/po/ku.po
index 975fd9608..25ddfdd2e 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -115,7 +115,7 @@ msgstr "Pêwist e tu mînakekê bidî"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakêt nehate dîtin %s"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -261,7 +261,7 @@ msgstr "E"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -553,8 +553,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -588,7 +588,7 @@ msgstr "Betal."
msgid "Do you want to continue [Y/n]? "
msgstr "Dixwazî bidomînî [E/n]?"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -597,7 +597,7 @@ msgstr "Anîna %s %s biserneket\n"
msgid "Some files failed to download"
msgstr "Daxistina çend pelan biserneket"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr ""
@@ -779,33 +779,28 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -813,141 +808,141 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Cihê vala li %s têre nake"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -993,7 +988,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1061,7 +1056,7 @@ msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1085,7 +1080,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1456,8 +1451,8 @@ msgstr "Çewtiya hundirîn"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nikare %s bixwîne"
@@ -1843,11 +1838,10 @@ msgid "Failed to rename %s to %s"
msgstr ""
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1855,19 +1849,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-"\n"
-"Ferman\n"
-" shell - moda shell\n"
-" dump - Mîhengan nîşan dide\n"
-"\n"
-"Vebijark:\n"
-" -h Ev dosyeya alîkariyê ye.\n"
-" -c=? Dosyeya mîhengan nîşan dide\n"
-" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
-"mînak -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2078,26 +2062,26 @@ msgstr "%s venebû"
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nivîsîna pelê %s biserneket"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2640,12 +2624,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2736,7 +2720,7 @@ msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lîsteya pakêtan tê xwendin"
@@ -2744,7 +2728,7 @@ msgstr "Lîsteya pakêtan tê xwendin"
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
@@ -2987,49 +2971,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Sazkirin tê betalkirin."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Peywira %s nehate dîtin"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3054,115 +3038,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s tê mîhengkirin"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s tê rakirin"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s tê derxistin"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Mîhengkirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Bi tevahî rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3174,7 +3158,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3203,6 +3193,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Bikaranîn: apt-config [vebijark] ferman\n"
+#~ "apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
+#~ "\n"
+#~ "Ferman\n"
+#~ " shell - moda shell\n"
+#~ " dump - Mîhengan nîşan dide\n"
+#~ "\n"
+#~ "Vebijark:\n"
+#~ " -h Ev dosyeya alîkariyê ye.\n"
+#~ " -c=? Dosyeya mîhengan nîşan dide\n"
+#~ " -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar "
+#~ "bike. mînak -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Rakirina %s biserneket"
diff --git a/po/lt.po b/po/lt.po
index d3d28c856..cfb35964e 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nepavyko rasti paketo %s"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -258,7 +258,7 @@ msgstr "T"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -558,8 +558,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -596,7 +596,7 @@ msgstr "Nutraukti."
msgid "Do you want to continue [Y/n]? "
msgstr "Ar norite tęsti [T/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
@@ -605,7 +605,7 @@ msgstr "Nepavyko parsiųsti %s %s\n"
msgid "Some files failed to download"
msgstr "Nepavyko parsiųsti kai kurių failų"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
@@ -796,33 +796,28 @@ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -830,85 +825,85 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Neturite pakankamai laisvos vietos %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Parsiunčiamas archyvas %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -916,7 +911,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -924,14 +919,14 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
"per naujas"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -940,7 +935,7 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -948,30 +943,30 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1017,7 +1012,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1088,7 +1083,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1112,7 +1107,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1479,8 +1474,8 @@ msgstr "Vidinė klaida"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nepavyko perskaityti %s"
@@ -1930,11 +1925,10 @@ msgid "Failed to rename %s to %s"
msgstr "Nepavyko pervadinti %s į %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1942,18 +1936,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
-"\n"
-"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
-"informacijos išskleidimui\n"
-"iš debian paketų\n"
-"\n"
-"Parametrai:\n"
-" -h Šis pagalbos tekstas\n"
-" -t Nustatyti laikinąjį aplanką\n"
-" -c=? Nuskaityti šį konfigūracijų failą\n"
-" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2172,26 +2157,26 @@ msgstr "Nepavyko pakeisti į %s"
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nepavyko patikrinti %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2737,12 +2722,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2835,7 +2820,7 @@ msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Skaitomi paketų sąrašai"
@@ -2843,7 +2828,7 @@ msgstr "Skaitomi paketų sąrašai"
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr ""
@@ -3086,49 +3071,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Diegimas nutraukiamas."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nepavyko rasti užduoties %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3153,115 +3138,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigūruojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Šalinamas %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Ruošiamas %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Išpakuojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Ruošiamasi konfigūruoti %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Ruošiamasi %s pašalinimui"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Ruošiamasi visiškai pašalinti %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3273,7 +3258,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3302,6 +3293,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+#~ "informacijos išskleidimui\n"
+#~ "iš debian paketų\n"
+#~ "\n"
+#~ "Parametrai:\n"
+#~ " -h Šis pagalbos tekstas\n"
+#~ " -t Nustatyti laikinąjį aplanką\n"
+#~ " -c=? Nuskaityti šį konfigūracijų failą\n"
+#~ " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Nepavyko pašalinti %s"
diff --git a/po/mr.po b/po/mr.po
index fe19ac652..b46f755ff 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -110,7 +110,7 @@ msgstr "तुम्हाला फक्त एकच नमुना द्
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "होय"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -589,8 +589,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
@@ -627,7 +627,7 @@ msgstr "व्यत्यय/बंद करा."
msgid "Do you want to continue [Y/n]? "
msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -636,7 +636,7 @@ msgstr "%s %s आणणे असफल\n"
msgid "Some files failed to download"
msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
@@ -832,33 +832,28 @@ msgstr "अंतर्गत त्रुटी, अडचण निवार
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -866,104 +861,104 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s मध्ये पुरेशी जागा नाही"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -972,37 +967,37 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1089,7 +1084,7 @@ msgstr ""
" apt.conf(5) पुस्तिका पाने पहा.\n"
" ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1155,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -1184,7 +1179,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1557,8 +1552,8 @@ msgstr "अंतर्गत त्रुटी"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s वाचण्यास असमर्थ"
@@ -1999,11 +1994,10 @@ msgid "Failed to rename %s to %s"
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2011,17 +2005,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
-" \n"
-"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर्याय : \n"
-" -h हा साह्याकारी मजकूर \n"
-" -t टेंप डिर निर्धारित करा \n"
-" -c=? ही संरचना संचिका वाचा \n"
-" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2240,25 +2226,25 @@ msgstr "जारी करण्यास करण्यास असमर्
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "फाईल छोटी करणे असफल"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2811,12 +2797,12 @@ msgstr "%s कार्यपध्दती योग्य रीतीने
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
@@ -2912,7 +2898,7 @@ msgid "Couldn't stat source package list %s"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "पॅकेज याद्या वाचत आहोत"
@@ -2920,7 +2906,7 @@ msgstr "पॅकेज याद्या वाचत आहोत"
msgid "Collecting File Provides"
msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
@@ -3173,49 +3159,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "संस्थापन खंडित करत आहे."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s कार्य सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3240,115 +3226,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s संस्थापित होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s संरचित होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s काढून टाकत आहे"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' संचयिका गहाळ आहे"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s फाईल उघडता येत नाही"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s तयार करित आहे"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s सुटे/मोकळे करीत आहे "
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s संरचने साठी तयार करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s संस्थापित झाले"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3360,7 +3346,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3389,6 +3381,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+#~ " \n"
+#~ "ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+#~ "डेबियन पॅकेजेस मधून \n"
+#~ "\n"
+#~ "पर्याय : \n"
+#~ " -h हा साह्याकारी मजकूर \n"
+#~ " -t टेंप डिर निर्धारित करा \n"
+#~ " -c=? ही संरचना संचिका वाचा \n"
+#~ " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s कायमचे काढून टाकण्यास असमर्थ"
diff --git a/po/nb.po b/po/nb.po
index 8b9d98123..8e53f0b0c 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -114,7 +114,7 @@ msgstr "Du må oppgi minst ett søkemønster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Klarer ikke å finne pakken %s"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -298,7 +298,7 @@ msgstr "J"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -599,8 +599,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -638,7 +638,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
@@ -647,7 +647,7 @@ msgstr "Klarte ikke å skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikke laste ned alle filene"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
@@ -845,26 +845,21 @@ msgstr "Intern feil, problemløser ødela noe"
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -873,7 +868,7 @@ msgstr ""
"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -884,106 +879,106 @@ msgstr ""
"bzr get %s\n"
"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
"%s er for ny"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -992,37 +987,37 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Kobler til %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1111,7 +1106,7 @@ msgstr ""
"for mer informasjon og flere valg.\n"
" Denne APT har kraften til en Superku.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1186,7 +1181,7 @@ msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -1210,7 +1205,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1586,8 +1581,8 @@ msgstr "Intern feil"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke å lese %s"
@@ -2033,11 +2028,10 @@ msgid "Failed to rename %s to %s"
msgstr "Klarte ikke å endre navnet på %s til %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2045,18 +2039,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et verktøy til å hente ut informasjon om "
-"innstillinger\n"
-"og maler fra debianpakker.\n"
-"\n"
-"Innstillinger:\n"
-" -h Denne hjelpeteksten\n"
-" -t Lag en midlertidig mappe\n"
-" -c=? Les denne innstillingsfila.\n"
-" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2274,11 +2259,11 @@ msgstr "Klarte ikke synkronisere mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Klarte ikke forkorte fila %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2287,7 +2272,7 @@ msgstr ""
"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
"Nåværende verdi: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2296,7 +2281,7 @@ msgstr ""
"Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er "
"nådd."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2853,12 +2838,12 @@ msgstr "Metoden %s startet ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» støttes ikke"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2951,7 +2936,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Leser pakkelister"
@@ -2959,7 +2944,7 @@ msgstr "Leser pakkelister"
msgid "Collecting File Provides"
msgstr "Samler inn filtilbud"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
@@ -3215,32 +3200,32 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Ingen nøkkelring installert i %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgave «%s» av «%s» ble ikke funnet"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versjon «%s» av «%s» ble ikke funnet"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Klarte ikke å finne oppgave «%s»"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3249,20 +3234,20 @@ msgstr ""
"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
"har ingen av dem"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
"kandidat"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3289,109 +3274,109 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerer %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Setter opp %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Fjerner %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Legger merke til at %s forsvinner"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kjører etter-installasjonsutløser %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mappa «%s» mangler"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikke åpne fila «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Forbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Pakker ut %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Forbereder oppsett av %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerte %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Forbereder fjerning av %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Fjernet %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Forbereder å fullstendig slette %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Kjører dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "avhengighetsproblemer - lar den være uoppsatt"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3399,7 +3384,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
"følgefeil fra en tidligere feil."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3415,7 +3400,16 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
"minne»-feil"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3446,6 +3440,31 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#, fuzzy
+#~ 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 ""
+#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates er et verktøy til å hente ut informasjon om "
+#~ "innstillinger\n"
+#~ "og maler fra debianpakker.\n"
+#~ "\n"
+#~ "Innstillinger:\n"
+#~ " -h Denne hjelpeteksten\n"
+#~ " -t Lag en midlertidig mappe\n"
+#~ " -c=? Les denne innstillingsfila.\n"
+#~ " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Klarte ikke å fjerne %s"
diff --git a/po/ne.po b/po/ne.po
index 2761f0b2a..e30dbd594 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -113,7 +113,7 @@ msgstr "तपाईँले एउटा वास्तविक बान्
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "प्याकेज %s तोक्न असक्षम भयो"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -296,7 +296,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -593,8 +593,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस्
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
@@ -631,7 +631,7 @@ msgstr "परित्याग गर्नुहोस् ।"
msgid "Do you want to continue [Y/n]? "
msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
@@ -640,7 +640,7 @@ msgstr "%s %s तान्न असफल भयो\n"
msgid "Some files failed to download"
msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
@@ -832,33 +832,28 @@ msgstr "आन्तरिक त्रुटि,समस्या हलकर
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -866,104 +861,104 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -972,37 +967,37 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1087,7 +1082,7 @@ msgstr ""
"pages हेर्नुहोस् ।\n"
" APT संग सुपर काउ शक्तिहरू छ ।\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1153,7 @@ msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1182,7 +1177,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1554,8 +1549,8 @@ msgstr "आन्तरिक त्रुटि"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "%s पढ्न असफल भयो"
@@ -1996,11 +1991,10 @@ msgid "Failed to rename %s to %s"
msgstr " %s मा %s पुन:नामकरण असफल भयो"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2008,17 +2002,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-" -h यो मद्दत पाठ\n"
-" -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2236,26 +2222,26 @@ msgstr "आह्वान गर्न असक्षम भयो"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "फाइल %s लेख्न असफल भयो"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2808,12 +2794,12 @@ msgstr "विधि %s सही रुपले सुरू हुन सक
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
@@ -2905,7 +2891,7 @@ msgid "Couldn't stat source package list %s"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "प्याकेज सूचिहरू पढिदैछ"
@@ -2913,7 +2899,7 @@ msgstr "प्याकेज सूचिहरू पढिदैछ"
msgid "Collecting File Provides"
msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
@@ -3164,49 +3150,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "स्थापना परित्याग गरिदैछ ।"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3231,115 +3217,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " %s स्थापना भयो"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr " %s कनफिगर गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr " %s हटाइदैछ"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "फाइल %s खोल्न सकिएन"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr " %s तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr " %s अनप्याक गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr " %s कनफिगर गर्न तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr " %s स्थापना भयो"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr " %s हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr " %s हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3351,7 +3337,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3380,6 +3372,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+#~ "\n"
+#~ " apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण "
+#~ "हो\n"
+#~ "\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ " -h यो मद्दत पाठ\n"
+#~ " -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+#~ " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+#~ " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s लाई फेरी सार्न असफल भयो"
diff --git a/po/nl.po b/po/nl.po
index 114bee569..66419cc6a 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -113,7 +113,7 @@ msgstr "U dient precies één zoekpatroon op te geven"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Kan pakket %s niet vinden"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -298,7 +298,7 @@ msgstr "J"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -602,8 +602,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -640,7 +640,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
@@ -649,7 +649,7 @@ msgstr "Ophalen van %s is mislukt %s\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -850,28 +850,23 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -881,7 +876,7 @@ msgstr ""
"'%s' op:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -893,87 +888,87 @@ msgstr ""
"om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
"te halen.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste één pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -982,7 +977,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -991,14 +986,14 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1007,7 +1002,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1016,30 +1011,30 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1128,7 +1123,7 @@ msgstr ""
"voor meer informatie en opties.\n"
" Deze APT heeft Super Koe kracht.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1203,7 +1198,7 @@ msgid "%s was already not hold.\n"
msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1227,7 +1222,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1608,8 +1603,8 @@ msgstr "Interne fout"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -2061,11 +2056,10 @@ msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2073,18 +2067,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
-"\n"
-"apt-extracttemplates is een programma om configuratie- en "
-"sjablooninformatie\n"
-"uit Debian pakketten te halen.\n"
-"\n"
-"Opties:\n"
-" -h Deze hulptekst.\n"
-" -t Stel de tijdelijke map in.\n"
-" -c=? Lees dit configuratiebestand.\n"
-" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2301,11 +2286,11 @@ msgstr "Kan mmap niet synchronizeren"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Afkorten van bestand is mislukt"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2314,7 +2299,7 @@ msgstr ""
"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
"Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2323,7 +2308,7 @@ msgstr ""
"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al "
"is bereikt"
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2893,12 +2878,12 @@ msgstr ""
"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
"'enter' te drukken."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2999,7 +2984,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Pakketlijsten worden ingelezen"
@@ -3007,7 +2992,7 @@ msgstr "Pakketlijsten worden ingelezen"
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
@@ -3268,33 +3253,33 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Geen sleutelring geïnstalleerd in %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' voor '%s' is niet gevonden"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kon taak '%s' niet vinden"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, fuzzy, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3303,21 +3288,21 @@ msgstr ""
"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
"selecteren omdat deze geen van beide heeft"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
"virtueel is"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
"kandidaat heeft"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3344,113 +3329,113 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s wordt geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s wordt geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s wordt verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s wordt volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "De verdwijning van %s wordt opgemerkt"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Post-installatie-trigger %s wordt uitgevoerd"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Map '%s' ontbreekt"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kon het bestand '%s' niet openen"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s wordt uitgepakt"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Configuratie van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s is geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s is verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Volledige verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
"aangekoppeld?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "dpkg wordt uitgevoerd"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
"(MaxReports) al is bereikt"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemen met vereisten - wordt niet geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3458,7 +3443,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
"eerdere mislukking."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3474,7 +3459,16 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over onvoldoende-geheugen."
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
+"over een volle schijf."
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3508,6 +3502,31 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
+#, fuzzy
+#~ 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 ""
+#~ "Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates is een programma om configuratie- en "
+#~ "sjablooninformatie\n"
+#~ "uit Debian pakketten te halen.\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ " -h Deze hulptekst.\n"
+#~ " -t Stel de tijdelijke map in.\n"
+#~ " -c=? Lees dit configuratiebestand.\n"
+#~ " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Verwijderen van %s is mislukt"
diff --git a/po/nn.po b/po/nn.po
index 170c65c2b..22f414ceb 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -115,7 +115,7 @@ msgstr "Du m oppgi nyaktig eitt mnster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Finn ikkje pakken %s"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -300,7 +300,7 @@ msgstr "J"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -604,8 +604,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -643,7 +643,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -652,7 +652,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -845,33 +845,28 @@ msgstr "Intern feil. AllUpgrade ydelagde noko"
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -879,105 +874,105 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -986,37 +981,37 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Koplar til %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1102,7 +1097,7 @@ msgstr ""
"til apt-get(8), sources.list(5) og apt.conf(5).\n"
" APT har superku-krefter.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1173,7 +1168,7 @@ msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -1197,7 +1192,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1571,8 +1566,8 @@ msgstr "Intern feil"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -2008,11 +2003,10 @@ msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet p %s til %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2020,17 +2014,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er eit verkty for henta ut informasjon om\n"
-"oppsett og malar fr Debian-pakkar.\n"
-"\n"
-"Val:\n"
-" -h Vis denne hjelpeteksten\n"
-" -t Vel mellombels katalog\n"
-" -c=? Les denne innstillingsfila.\n"
-" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2249,26 +2235,26 @@ msgstr "Klarte ikkje starta "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Klarte ikkje skriva fila %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2826,12 +2812,12 @@ msgstr ""
" %s\n"
"i stasjonen %s og trykk Enter.\n"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s er ikkje sttta"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2924,7 +2910,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Les pakkelister"
@@ -2932,7 +2918,7 @@ msgstr "Les pakkelister"
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
@@ -3183,49 +3169,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Avbryt installasjon."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgva %s av %s"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen %s av %s"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3250,115 +3236,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Koplar til %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikkje opna fila %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Tilrdingar"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3370,7 +3356,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3399,6 +3391,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates er eit verkty for henta ut informasjon om\n"
+#~ "oppsett og malar fr Debian-pakkar.\n"
+#~ "\n"
+#~ "Val:\n"
+#~ " -h Vis denne hjelpeteksten\n"
+#~ " -t Vel mellombels katalog\n"
+#~ " -c=? Les denne innstillingsfila.\n"
+#~ " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Klarte ikkje fjerna %s"
diff --git a/po/pl.po b/po/pl.po
index 61f20d2bb..e45a1fceb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-01-22 20:35+0100\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -115,7 +115,7 @@ msgstr "Należy podać przynajmniej jeden wzorzec"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
@@ -161,7 +161,7 @@ msgid " Version table:"
msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -296,7 +296,7 @@ msgstr "T"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -597,8 +597,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -636,7 +636,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Kontynuować [T/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -645,7 +645,7 @@ msgstr "Nie udało się pobrać %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udało się pobrać niektórych plików"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
@@ -862,28 +862,23 @@ msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Pobieranie %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -893,7 +888,7 @@ msgstr ""
"pod adresem:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -905,70 +900,70 @@ msgstr ""
"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
"pakietu.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobieranie źródeł %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności dla budowania"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -977,17 +972,17 @@ msgstr ""
"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -996,7 +991,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
"w pakietach \"%s\""
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1005,14 +1000,14 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1021,7 +1016,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
"pakietu %s nie spełnia wymagań wersji"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1030,30 +1025,30 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
"wersji kandydującej"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności dla budowania %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Dziennik zmian %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1141,7 +1136,7 @@ msgstr ""
"apt-get(8), sources.list(5) i apt.conf(5).\n"
" Ten APT ma moce Super Krowy.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1219,7 +1214,7 @@ msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -1245,7 +1240,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1644,8 +1639,8 @@ msgstr "Błąd wewnętrzny"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nie można czytać %s"
@@ -2093,11 +2088,10 @@ msgid "Failed to rename %s to %s"
msgstr "Nie udało się zmienić nazwy %s na %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2105,17 +2099,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
-"\n"
-"apt-extracttemplates to narzędzie służące do pobierania informacji\n"
-"i konfiguracji i szablonach z pakietów Debiana.\n"
-"\n"
-"Opcje:\n"
-" -h Ten tekst pomocy.\n"
-" -t Ustawia katalog tymczasowy\n"
-" -c=? Czyta wskazany plik konfiguracyjny.\n"
-" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2333,11 +2319,11 @@ msgstr "Nie udało się zsynchronizować mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udało się wykonać mmap %lu bajtów"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Nie udało się uciąć zawartości pliku %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2346,7 +2332,7 @@ msgstr ""
"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
"Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2355,7 +2341,7 @@ msgstr ""
"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już "
"osiągnięty."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2923,12 +2909,12 @@ msgstr "Metoda %s nie uruchomiła się poprawnie"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietów \"%s\" nie jest obsługiwany"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
@@ -3022,7 +3008,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Czytanie list pakietów"
@@ -3030,7 +3016,7 @@ msgstr "Czytanie list pakietów"
msgid "Collecting File Provides"
msgstr "Zbieranie zapewnień plików"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
@@ -3290,35 +3276,35 @@ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
msgid "No keyring installed in %s."
msgstr "Brak zainstalowanej bazy kluczy w %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nie udało się odnaleźć zadania \"%s\""
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
"wirtualny"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3327,21 +3313,21 @@ msgstr ""
"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
"ponieważ nie ma żadnej z nich"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
"czysto wirtualny"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
"kandydata"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3368,111 +3354,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigurowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Całkowite usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Proszę odnotować zniknięcie %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Uruchamianie wyzwalacza post-installation %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Brakuje katalogu \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nie udało się otworzyć pliku \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Przygotowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozpakowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Przygotowywanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Pakiet %s został zainstalowany"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Przygotowywanie do usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pakiet %s został usunięty"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Przygotowywanie do całkowitego usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Pakiet %s został całkowicie usunięty"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie jest "
"zamontowane?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Uruchamianie dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3480,7 +3466,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
"przyczyna niepowodzenia leży w poprzednim błędzie."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3496,7 +3482,16 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
"braku wolnej pamięci"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
+"przepełnienie dysku"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3533,6 +3528,72 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n"
+#~ "\n"
+#~ "apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n"
+#~ "jako zainstalowane automatycznie lub ręcznie. Może także służyć\n"
+#~ "do wyświetlania stanu oznaczeń.\n"
+#~ "\n"
+#~ "Polecenia:\n"
+#~ " auto - Oznacza dany pakiet jako zainstalowany automatycznie\n"
+#~ " manual - Oznacza dany pakiet jako zainstalowany ręcznie\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ " -h Ten tekst pomocy\n"
+#~ " -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
+#~ "działania)\n"
+#~ " -qq Nie wypisuje nic oprócz komunikatów błędów\n"
+#~ " -s Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
+#~ " -f zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
+#~ " -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
+#~ "i apt.conf(5), aby uzyskać więcej informacji."
+
+#, fuzzy
+#~ 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 ""
+#~ "Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates to narzędzie służące do pobierania informacji\n"
+#~ "i konfiguracji i szablonach z pakietów Debiana.\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ " -h Ten tekst pomocy.\n"
+#~ " -t Ustawia katalog tymczasowy\n"
+#~ " -c=? Czyta wskazany plik konfiguracyjny.\n"
+#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Nie udało się usunąć %s"
diff --git a/po/pt.po b/po/pt.po
index cd1547e7a..597026007 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-08-28 09:03+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -109,7 +109,7 @@ msgstr "Tem de fornecer pelo menos um padrão de busca"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Não foi possível encontrar o pacote %s"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -296,7 +296,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -596,8 +596,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -634,7 +634,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -643,7 +643,7 @@ msgstr "Falhou obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
@@ -843,26 +843,21 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas"
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -872,7 +867,7 @@ msgstr ""
"'%s' em:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -883,89 +878,89 @@ msgstr ""
"bzr get %s\n"
"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -974,7 +969,7 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -983,14 +978,14 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -999,7 +994,7 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1008,30 +1003,30 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "A Ligar a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1122,7 +1117,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5)\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1197,7 +1192,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já está na versão mais recente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -1221,7 +1216,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1598,8 +1593,8 @@ msgstr "Erro interno"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Não foi possível ler %s"
@@ -2047,11 +2042,10 @@ msgid "Failed to rename %s to %s"
msgstr "Falhou renomear %s para %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2059,18 +2053,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair configuração\n"
-"e informação de template de pacotes debian.\n"
-"\n"
-"Opções:\n"
-" -h Este texto de ajuda\n"
-" -t Definir o directório temporário\n"
-" -c=? Ler este ficheiro de configuração\n"
-" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2287,11 +2272,11 @@ msgstr "Não foi sincronizar mmap "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Falhou truncar o ficheiro"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2300,7 +2285,7 @@ msgstr ""
"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
"Limit. Valor actual: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2309,7 +2294,7 @@ msgstr ""
"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já "
"foi alcançado."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2880,12 +2865,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento adequado"
@@ -2985,7 +2970,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "A ler as listas de pacotes"
@@ -2993,7 +2978,7 @@ msgstr "A ler as listas de pacotes"
msgid "Collecting File Provides"
msgstr "A obter File Provides"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
@@ -3256,33 +3241,33 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Nenhum keyring instalado em %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Não foi encontrado o Release '%s' para '%s'"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Não foi encontrada a versão '%s' para '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Não foi possível encontrar a tarefa '%s'"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3291,21 +3276,21 @@ msgstr ""
"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
"'%s' pois não tem nenhuma destas"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
"já que é puramente virtual"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
"candidato"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3332,111 +3317,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "A instalar %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "A remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "A notar o desaparecimento de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A correr o 'trigger' de pós-instalação %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta o directório '%s'"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir ficheiro o '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "A desempacotar %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "A preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "A preparar a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A preparar para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
"montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "A correr o dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependências - deixando por configurar"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3444,7 +3429,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
"de seguimento de um erro anterior."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3460,7 +3445,16 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
"memória esgotada"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3497,6 +3491,31 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#, fuzzy
+#~ 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 ""
+#~ "Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
+#~ "\n"
+#~ "O apt-extracttemplates é uma ferramenta para extrair configuração\n"
+#~ "e informação de template de pacotes debian.\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ " -h Este texto de ajuda\n"
+#~ " -t Definir o directório temporário\n"
+#~ " -c=? Ler este ficheiro de configuração\n"
+#~ " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Falhou remover %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 930ec79a3..8ffb22550 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -111,7 +111,7 @@ msgstr "Você deve passar exatamente um padrão"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossível encontrar o pacote %s"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -300,7 +300,7 @@ msgstr "S"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -601,8 +601,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -639,7 +639,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Você quer continuar [S/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -648,7 +648,7 @@ msgstr "Falhou ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -849,33 +849,28 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas"
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -883,87 +878,87 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -972,7 +967,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -981,14 +976,14 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -997,7 +992,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1006,30 +1001,30 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectando em %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1117,7 +1112,7 @@ msgstr ""
"para mais informações e opções.\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1188,7 +1183,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -1212,7 +1207,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1590,8 +1585,8 @@ msgstr "Erro interno"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -2039,11 +2034,10 @@ msgid "Failed to rename %s to %s"
msgstr "Falhou ao renomear %s para %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2051,18 +2045,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
-"(\"template\") e configuração de pacotes debian.\n"
-"\n"
-"Opções:\n"
-" -h Este texto de ajuda\n"
-" -t Define o diretório temporário\n"
-" -c=? Lê o arquivo de configuração especificado.\n"
-" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2282,25 +2267,25 @@ msgstr "Impossível invocar "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Falhou ao truncar arquivo"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2864,12 +2849,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
@@ -2968,7 +2953,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Lendo listas de pacotes"
@@ -2976,7 +2961,7 @@ msgstr "Lendo listas de pacotes"
msgid "Collecting File Provides"
msgstr "Coletando Arquivo \"Provides\""
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar cache fonte"
@@ -3232,49 +3217,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Abortando instalação."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrada"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossível achar tarefa %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Impossível achar pacote %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3299,115 +3284,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Removendo %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando gatilho pós-instalação %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Diretório '%s' está faltando"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir arquivo %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempacotando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparando para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparando para a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparando para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3419,7 +3404,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3448,6 +3439,32 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
+#~ "\n"
+#~ "O apt-extracttemplates é uma ferramenta para extrair informações de "
+#~ "modelo\n"
+#~ "(\"template\") e configuração de pacotes debian.\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ " -h Este texto de ajuda\n"
+#~ " -t Define o diretório temporário\n"
+#~ " -c=? Lê o arquivo de configuração especificado.\n"
+#~ " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Falhou ao remover %s"
diff --git a/po/ro.po b/po/ro.po
index e1556214a..456fea358 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -113,7 +113,7 @@ msgstr "Trebuie să dați exact un șablon"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nu s-a putut localiza pachetul %s"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -297,7 +297,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -595,8 +595,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
@@ -634,7 +634,7 @@ msgstr "Renunțare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreți să continuați [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -643,7 +643,7 @@ msgstr "Eșec la aducerea lui %s %s\n"
msgid "Some files failed to download"
msgstr "Descărcarea unor fișiere a eșuat"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
@@ -850,33 +850,28 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -884,87 +879,87 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveți suficient spațiu în %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -973,7 +968,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -982,14 +977,14 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -998,7 +993,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1007,30 +1002,30 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectare la %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1119,7 +1114,7 @@ msgstr ""
"pentru mai multe informații și opțiuni.\n"
" Acest APT are puterile unei Super Vaci.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1190,7 +1185,7 @@ msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -1214,7 +1209,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1595,8 +1590,8 @@ msgstr "Eroare internă"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nu s-a putut citi %s"
@@ -2046,11 +2041,10 @@ msgid "Failed to rename %s to %s"
msgstr "Eșec la redenumirea lui %s în %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2058,17 +2052,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
-"\n"
-"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
-"de configurare și a șabloanelor dintr-un pachet Debian\n"
-"\n"
-"Opțiuni\n"
-" -h Acest text de ajutor.\n"
-" -t Impune directorul temporar\n"
-" -c=? Citește acest fișier de configurare\n"
-" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2292,25 +2278,25 @@ msgstr "Nu s-a putut invoca"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu s-a putut face mmap cu %lu octeți"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Eșec la trunchierea fișierului"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2868,12 +2854,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
@@ -2973,7 +2959,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nu pot determina starea listei surse de pachete %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Citire liste de pachete"
@@ -2981,7 +2967,7 @@ msgstr "Citire liste de pachete"
msgid "Collecting File Provides"
msgstr "Colectare furnizori fișier"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
@@ -3238,49 +3224,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Abandonez instalarea."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' pentru '%s' n-a fost găsită"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nu s-a putut găsi sarcina %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3305,116 +3291,116 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Se instalează %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Se configurează %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Se șterge %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Se rulează declanșatorul post-instalare %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Directorul „%s” lipsește."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nu s-a putut deschide fișierul %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Se pregătește %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Se despachetează %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Se pregătește configurarea %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Instalat %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Se pregătește ștergerea lui %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Șters %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Se pregătește ștergerea completă a %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3426,7 +3412,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3455,6 +3447,31 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+#~ "de configurare și a șabloanelor dintr-un pachet Debian\n"
+#~ "\n"
+#~ "Opțiuni\n"
+#~ " -h Acest text de ajutor.\n"
+#~ " -t Impune directorul temporar\n"
+#~ " -c=? Citește acest fișier de configurare\n"
+#~ " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Eșec la ștergerea lui %s"
diff --git a/po/ru.po b/po/ru.po
index d66fe2456..1cd7e7772 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-01-06 10:36+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -118,7 +118,7 @@ msgstr "Вы должны задать не менее одно шаблона
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Не удалось найти пакет %s"
@@ -162,7 +162,7 @@ msgid " Version table:"
msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -297,7 +297,7 @@ msgstr "д"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения — %s"
@@ -603,8 +603,8 @@ msgstr ""
"После данной операции, объём занятого дискового пространства уменьшится на "
"%sB.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -643,7 +643,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
@@ -652,7 +652,7 @@ msgstr "Не удалось получить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы скачать не удалось"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только скачивание\", и скачивание завершено"
@@ -859,27 +859,22 @@ msgstr "Внутренняя ошибка, решатель проблем вс
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Выполняется загрузка %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходным кодом для %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -888,7 +883,7 @@ msgstr ""
"ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -899,70 +894,70 @@ msgstr ""
"bzr get %s\n"
"для получения последних (возможно не выпущенных) обновлений пакета.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл «%s»\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо получить %sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение исходного кода %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -971,17 +966,17 @@ msgstr ""
"У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -990,7 +985,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
"разрешён для пакетов «%s»"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -999,14 +994,14 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1015,7 +1010,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как версия-"
"кандидат пакета %s не может удовлетворить требованиям по версии"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1024,30 +1019,30 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"имеет версии-кандидата"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog для %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1139,7 +1134,7 @@ msgstr ""
"содержится подробная информация и описание параметров.\n"
" В APT есть коровья СУПЕРСИЛА.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1214,7 +1209,7 @@ msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -1239,7 +1234,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1639,8 +1634,8 @@ msgstr "Внутренняя ошибка"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
@@ -2091,11 +2086,10 @@ msgid "Failed to rename %s to %s"
msgstr "Не удалось переименовать %s в %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2103,16 +2097,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Использование: apt-extracttemplates файл1 [файл2…]\n"
-"\n"
-"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
-"\n"
-"Параметры:\n"
-" -h Этот текст\n"
-" -t Задать каталог для временных файлов\n"
-" -c=? Читать указанный файл настройки\n"
-" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2330,11 +2317,11 @@ msgstr "Не удалось синхронизировать mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Невозможно отобразить в память %lu байт"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Не удалось обрезать файл"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2343,7 +2330,7 @@ msgstr ""
"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
"Текущее значение: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2351,7 +2338,7 @@ msgid ""
msgstr ""
"Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2925,12 +2912,12 @@ msgstr "Метод %s запустился не корректно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Система пакетирования «%s» не поддерживается"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Невозможно определить подходящий тип системы пакетирования"
@@ -3024,7 +3011,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Чтение списков пакетов"
@@ -3032,7 +3019,7 @@ msgstr "Чтение списков пакетов"
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
@@ -3293,33 +3280,33 @@ msgstr "Файл %s не начинается с прозрачно подпис
msgid "No keyring installed in %s."
msgstr "Связка ключей в %s не установлена."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Выпуск «%s» для «%s» не найден"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версия «%s» для «%s» не найдена"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Не удалось найти задачу «%s»"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3328,21 +3315,21 @@ msgstr ""
"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
"как в нём нет ни той, ни другой"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
"виртуальный"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
"кандидатов"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3369,111 +3356,111 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Устанавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Настраивается %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Удаляется %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Выполняется полное удаление %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Уведомление об исчезновении %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Выполняется послеустановочный триггер %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Отсутствует каталог «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Не удалось открыть файл «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Подготавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Распаковывается %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготавливается для настройки %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Установлен %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготавливается для удаления %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Удалён %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка к полному удалению %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
"смонтирован?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Запускается dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Отчёты apport не записаны, так достигнут MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "проблемы с зависимостями — оставляем ненастроенным"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3481,7 +3468,7 @@ msgstr ""
"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
"повторную ошибку от предыдущего отказа."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3497,7 +3484,16 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"памяти"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
+"места на диске"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3534,6 +3530,73 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n"
+#~ "\n"
+#~ "apt-mark — простая программа с интерфейсом командной строки\n"
+#~ "для отметки пакетов, что они установлены вручную или автоматически.\n"
+#~ "Также может показывать списки помеченных пакетов.\n"
+#~ "\n"
+#~ "Команды:\n"
+#~ " auto - пометить указанные пакеты, как установленные автоматически\n"
+#~ " manual - пометить указанные пакеты, как установленные вручную\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ " -h эта справка\n"
+#~ " -q показывать сообщения о работе, не выводить индикатор хода работы\n"
+#~ " -qq показывать только сообщения об ошибках\n"
+#~ " -s не выполнять действия на самом деле, только имитация работы\n"
+#~ " -f читать/писать данные о пометках в заданный файл\n"
+#~ " -c=? читать указанный файл настройки\n"
+#~ " -o=? задать значение произвольному параметру настройки,\n"
+#~ " например, -o dir::cache=/tmp\n"
+#~ "В справочных страницах apt-mark(8) и apt.conf(5)\n"
+#~ "содержится подробная информация и описание параметров."
+
+#, fuzzy
+#~ 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 ""
+#~ "Использование: apt-extracttemplates файл1 [файл2…]\n"
+#~ "\n"
+#~ "apt-extracttemplates извлекает из пакетов Debian данные config и "
+#~ "template\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ " -h Этот текст\n"
+#~ " -t Задать каталог для временных файлов\n"
+#~ " -c=? Читать указанный файл настройки\n"
+#~ " -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Не удалось удалить %s"
diff --git a/po/sk.po b/po/sk.po
index 803fab0d5..a18dbedee 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -114,7 +114,7 @@ msgstr ""
"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
"showauto“."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Nedá sa nájsť balík %s"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Tabuľka verzií:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -293,7 +293,7 @@ msgstr "Y"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -593,8 +593,8 @@ msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -631,7 +631,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -640,7 +640,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
@@ -849,26 +849,21 @@ msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:2386
-#, 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“"
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Sťahuje sa %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -878,7 +873,7 @@ msgstr ""
"adrese:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -890,70 +885,70 @@ msgstr ""
"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
"balíka.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -962,17 +957,17 @@ msgstr ""
"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
"nájdete v apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -981,20 +976,20 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
"„%s“"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1003,7 +998,7 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
"nedokáže splniť požiadavky na verziu"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1011,30 +1006,30 @@ msgid ""
msgstr ""
"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s nemožno splniť."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Záznam zmien %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1122,7 +1117,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tento APT má schopnosti posvätnej kravy.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1197,7 +1192,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -1221,7 +1216,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1613,8 +1608,8 @@ msgstr "Vnútorná chyba"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Nedá sa načítať %s"
@@ -2057,9 +2052,9 @@ msgstr "Premenovanie %s na %s zlyhalo"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2067,17 +2062,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Použitie: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
-"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
-"\n"
-"Voľby:\n"
-" -h Tento pomocník.\n"
-" -q Výstup vhodný do záznamu - bez indikátora priebehu\n"
-" -c=? Načíta tento konfiguračný súbor\n"
-" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2293,11 +2280,11 @@ msgstr "Nedá sa synchronizovať mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nedá sa urobiť mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Nepodarilo sa skrátiť súbor"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2306,7 +2293,7 @@ msgstr ""
"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2314,7 +2301,7 @@ msgid ""
msgstr ""
"Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2872,12 +2859,12 @@ msgstr "Spôsob %s nebol správne spustený"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Systém balíkov „%s“ nie je podporovaný"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ systému balíkov"
@@ -2972,7 +2959,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Načítavajú sa zoznamy balíkov"
@@ -2980,7 +2967,7 @@ msgstr "Načítavajú sa zoznamy balíkov"
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
@@ -3239,32 +3226,32 @@ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
msgid "No keyring installed in %s."
msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nebolo možné nájsť úlohu „%s“"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3273,20 +3260,20 @@ msgstr ""
"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
"pretože nemá žiadnu z nich"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
"virtuálny"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3313,111 +3300,111 @@ msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
msgid "Execute external solver"
msgstr "Spustiť externého riešiteľa"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Inštaluje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Úplne sa odstraňuje %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Zaznamenali sme zmiznutie %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Vykonáva sa spúšťač post-installation %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresár „%s“ chýba"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nedá sa otvoriť súbor „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
"pripojený?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Spúšťa sa dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3425,7 +3412,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
"nadväznosti na predošlé zlyhanie."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3441,7 +3428,16 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
"pamäte"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3471,6 +3467,73 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ 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“"
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
+#~ "\n"
+#~ "apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n"
+#~ "balíkov ako manuálne alebo automaticky nainštalované.\n"
+#~ "Tiež dokáže označenia vypisovať.\n"
+#~ "\n"
+#~ "Príkazy:\n"
+#~ " auto - Označí uvedené balíky ako automaticky nainštalované\n"
+#~ " manual - Označí uvedené balíky ako manuálne nainštalované\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ " -h Tento text pomocníka.\n"
+#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n"
+#~ " -qq Nevypisovať nič, len chyby\n"
+#~ " -s Nevykonávať zmeny. Iba vypísať, čo by sa urobilo.\n"
+#~ " -f čítanie/zápis označenia auto/manálne v uvedenom súbore\n"
+#~ " -c=? Načítať tento konfiguračný súbor\n"
+#~ " -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n"
+#~ "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf"
+#~ "(5)."
+
+#~ 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 ""
+#~ "Použitie: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
+#~ "riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ " -h Tento pomocník.\n"
+#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n"
+#~ " -c=? Načíta tento konfiguračný súbor\n"
+#~ " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Odstránenie %s zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index 7bf3076be..0c0877856 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "Podati morate vsaj en iskalni vzorec"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni mogoče najti paketa %s"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -291,7 +291,7 @@ msgstr "Y"
msgid "N"
msgstr "N"
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka med prevajanjem logičnega izraza - %s"
@@ -590,8 +590,8 @@ msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ni mogoče določiti prostega prostora v %s"
@@ -628,7 +628,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali želite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
@@ -637,7 +637,7 @@ msgstr "Ni mogoče dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prejem nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
@@ -850,27 +850,22 @@ msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
msgid "Unable to lock the download directory"
msgstr "Ni mogoče zakleniti mape prejemov"
-#: cmdline/apt-get.cc:2386
-#, 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'"
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr "Prejemanje %s %s"
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoče najti"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -879,7 +874,7 @@ msgstr ""
"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -890,70 +885,70 @@ msgstr ""
"bzr branch %s\n"
"za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskok že prejete datoteke '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Podrejeno opravilo ni uspelo"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -962,17 +957,17 @@ msgstr ""
"Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte "
"apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -980,20 +975,20 @@ msgid ""
msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1002,7 +997,7 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s ne more zadostiti zahtev različice"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1011,30 +1006,30 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s nima različice kandidata"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1121,7 +1116,7 @@ msgstr ""
" sources.list(5) in apt.conf(5). \n"
" Ta APT ima moči super krav.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1196,7 +1191,7 @@ msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -1220,7 +1215,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1236,24 +1231,6 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-"Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
-"\n"
-"apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
-"kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n"
-"\n"
-"Ukazi:\n"
-" auto - Označi dane pakete kot samodejno nameščene\n"
-" manual - Označi dane pakete kot ročno nameščene\n"
-"\n"
-"Možnosti:\n"
-" -h To besedilo pomoči.\n"
-" -q Izhod se beleži - brez kazalnika napredka\n"
-" -qq Brez izhoda razen napak\n"
-" -s Ne naredi ničesar. Samo napiše kaj bi bilo narejeno.\n"
-" -f Prebere/zapiše oznako ročno/samodejno za dano datoteko\n"
-" -c=? Prebere to nastavitveno datoteko\n"
-" -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n"
-"Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf(5)."
#: methods/cdrom.cc:203
#, c-format
@@ -1611,8 +1588,8 @@ msgstr "Notranja napaka"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoče brati %s"
@@ -2056,9 +2033,9 @@ msgstr "Ni mogoče preimenovati %s v %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2066,18 +2043,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Uporaba: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
-"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
-"podobno.\n"
-"\n"
-"Možnosti:\n"
-" -h To besedilo pomoči\n"
-" -q Izhod se beleži - ni kazalnika napredka\n"
-" -c=? Prebere to nastavitveno datoteko\n"
-" -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2294,11 +2262,11 @@ msgstr "Ni mogoče uskladiti mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoče narediti mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Ni mogoče obrezati datoteke"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2307,7 +2275,7 @@ msgstr ""
"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-"
"Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2315,7 +2283,7 @@ msgid ""
msgstr ""
"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2877,12 +2845,12 @@ msgstr "Način %s se ni začel pravilno"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
@@ -2975,7 +2943,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Ni mogoče določiti seznama izvornih paketov %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Branje seznama paketov"
@@ -2983,7 +2951,7 @@ msgstr "Branje seznama paketov"
msgid "Collecting File Provides"
msgstr "Zbiranje dobaviteljev datotek"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
@@ -3246,32 +3214,32 @@ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
msgid "No keyring installed in %s."
msgstr "V %s ni nameščenih zbirk ključev."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Izdaje '%s' za '%s' ni mogoče najti"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Različice '%s' za '%s' ni mogoče najti"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Ni mogoče najti naloge '%s'"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3280,19 +3248,19 @@ msgstr ""
"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
"'%s', saj nima nobenega od njiju"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
"navidezen"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
@@ -3317,112 +3285,112 @@ msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
msgid "Execute external solver"
msgstr "Izvedi zunanji reševalnik"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Nameščanje %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstranjevanje %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s je izginil"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Poganjanje sprožilca po namestitvi %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mapa '%s' manjka"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Ni mogoče odpreti datoteke '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Pripravljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Razširjanje %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravljanje na nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s je bil nameščen"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravljanje na odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s je bil odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravljanje na popolno odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ni mogoče pisati dnevnika, openpty() je spodletelo (/dev/pts ni "
"prklopljen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Poganjanje dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3430,7 +3398,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
"navezujočo napako iz predhodne napake."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3446,7 +3414,15 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
+"na krajevnem sistemu"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3478,6 +3454,74 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ 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'"
+
+#~ msgid ""
+#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-mark is a simple command line interface for marking packages\n"
+#~ "as manually or automatically installed. It can also list marks.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " auto - Mark the given packages as automatically installed\n"
+#~ " manual - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -s No-act. Just prints what would be done.\n"
+#~ " -f read/write auto/manual marking in the given file\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgstr ""
+#~ "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
+#~ "kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n"
+#~ "\n"
+#~ "Ukazi:\n"
+#~ " auto - Označi dane pakete kot samodejno nameščene\n"
+#~ " manual - Označi dane pakete kot ročno nameščene\n"
+#~ "\n"
+#~ "Možnosti:\n"
+#~ " -h To besedilo pomoči.\n"
+#~ " -q Izhod se beleži - brez kazalnika napredka\n"
+#~ " -qq Brez izhoda razen napak\n"
+#~ " -s Ne naredi ničesar. Samo napiše kaj bi bilo narejeno.\n"
+#~ " -f Prebere/zapiše oznako ročno/samodejno za dano datoteko\n"
+#~ " -c=? Prebere to nastavitveno datoteko\n"
+#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/"
+#~ "tmp\n"
+#~ "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf"
+#~ "(5)."
+
+#~ 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 ""
+#~ "Uporaba: apt-internal-solver\n"
+#~ "\n"
+#~ "apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
+#~ "reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
+#~ "podobno.\n"
+#~ "\n"
+#~ "Možnosti:\n"
+#~ " -h To besedilo pomoči\n"
+#~ " -q Izhod se beleži - ni kazalnika napredka\n"
+#~ " -c=? Prebere to nastavitveno datoteko\n"
+#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Odstranitev %s ni uspela"
@@ -3553,13 +3597,6 @@ msgstr "Ni zaklenjeno"
#~ msgid "Got a single header line over %u chars"
#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na "
-#~ "težavo na krajevnem sistemu"
-
#~ msgid "Malformed override %s line %lu #1"
#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
diff --git a/po/sv.po b/po/sv.po
index b860d1874..0231d484c 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -112,7 +112,7 @@ msgstr "Du måste ange minst ett sökmönster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunde inte hitta paketet %s"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -294,7 +294,7 @@ msgstr "J"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -596,8 +596,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -635,7 +635,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -644,7 +644,7 @@ msgstr "Misslyckades med att hämta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att hämta vissa filer"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
@@ -845,26 +845,21 @@ msgstr "Internt fel, problemlösaren förstörde någonting"
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -874,7 +869,7 @@ msgstr ""
"på:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -885,85 +880,85 @@ msgstr ""
"bzr get %s\n"
"för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -972,7 +967,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -981,14 +976,14 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -997,7 +992,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1006,31 +1001,31 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
# Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1118,7 +1113,7 @@ msgstr ""
"för mer information och flaggor.\n"
" Denna APT har Speciella Ko-Krafter.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1198,7 +1193,7 @@ msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -1222,7 +1217,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1602,8 +1597,8 @@ msgstr "Internt fel"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
@@ -2054,11 +2049,10 @@ msgid "Failed to rename %s to %s"
msgstr "Misslyckades med att byta namn på %s till %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2066,17 +2060,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
-"och mallinformation från paket\n"
-"\n"
-"Flaggor:\n"
-" -h Denna hjälptext.\n"
-" -t Ställ in temporärkatalogen.\n"
-" -c=? Läs denna konfigurationsfil.\n"
-" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2292,11 +2278,11 @@ msgstr "Kunde inte synkronisera mmap"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utföra mmap på %lu byte"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Misslyckades med att kapa av filen"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2305,7 +2291,7 @@ msgstr ""
"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
"Aktuellt värde: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2314,7 +2300,7 @@ msgstr ""
"Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har "
"uppnåtts."
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2877,13 +2863,13 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stöds inte"
#
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
@@ -2976,7 +2962,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Läser paketlistor"
@@ -2985,7 +2971,7 @@ msgstr "Läser paketlistor"
msgid "Collecting File Provides"
msgstr "Samlar filtillhandahållningar"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av källcache"
@@ -3241,33 +3227,33 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Ingen nyckelring installerad i %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" för \"%s\" hittades inte"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunde inte hitta funktionen \"%s\""
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3276,21 +3262,21 @@ msgstr ""
"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
"eftersom det inte har någon av dem"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
"virtuellt"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
"kandidat"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3317,110 +3303,110 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerar %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigurerar %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Tar bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Uppmärksammar försvinnandet av %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kör efterinstallationsutlösare %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Katalogen \"%s\" saknas"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Förbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Packar upp %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Förbereder konfigurering av %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerade %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Förbereder borttagning av %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Tog bort %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Förbereder borttagning av hela %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Kör dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "beroendeproblem - lämnar okonfigurerad"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3428,7 +3414,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
"ett efterföljande fel från ett tidigare problem."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3444,7 +3430,16 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
"är slut"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
+"diskutrymmet är slut"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3477,6 +3472,31 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
+#, fuzzy
+#~ 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 ""
+#~ "Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+#~ "och mallinformation från paket\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ " -h Denna hjälptext.\n"
+#~ " -t Ställ in temporärkatalogen.\n"
+#~ " -c=? Läs denna konfigurationsfil.\n"
+#~ " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/"
+#~ "tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Misslyckades med att ta bort %s"
diff --git a/po/th.po b/po/th.po
index f1c75bcfa..b3cc1ca2b 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2008-11-06 15:54+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -111,7 +111,7 @@ msgstr "คุณต้องระบุแพตเทิร์นด้วย
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "ไม่พบแพกเกจ %s"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -293,7 +293,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -589,8 +589,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -627,7 +627,7 @@ msgstr "เลิกทำ"
msgid "Do you want to continue [Y/n]? "
msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -636,7 +636,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
msgid "Some files failed to download"
msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
@@ -828,33 +828,28 @@ msgstr "เกิดข้อผิดพลาดภายใน: กลไก
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -862,104 +857,104 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -968,37 +963,37 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "เชื่อมต่อไปยัง %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1084,7 +1079,7 @@ msgstr ""
"และ apt.conf(5)\n"
" APT นี้มีพลังของ Super Cow\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1155,7 +1150,7 @@ msgid "%s was already not hold.\n"
msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -1179,7 +1174,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1548,8 +1543,8 @@ msgstr "ข้อผิดพลาดภายใน"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "ไม่สามารถอ่าน %s"
@@ -1983,11 +1978,10 @@ msgid "Failed to rename %s to %s"
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1995,17 +1989,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
-"ออกมาจากแพกเกจเดเบียน\n"
-"\n"
-"ตัวเลือก:\n"
-" -h แสดงข้อความช่วยเหลือนี้\n"
-" -t กำหนดไดเรกทอรีทำงานชั่วคราว\n"
-" -c=? อ่านแฟ้มค่าตั้งนี้\n"
-" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2223,25 +2209,25 @@ msgstr "ไม่สามารถเรียก "
msgid "Couldn't make mmap of %lu bytes"
msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "ไม่สามารถตัดท้ายแฟ้ม"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2792,12 +2778,12 @@ msgstr "ไม่สามารถเรียกทำงานวิธีก
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ไม่รองรับระบบแพกเกจ '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
@@ -2888,7 +2874,7 @@ msgid "Couldn't stat source package list %s"
msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "กำลังอ่านรายชื่อแพกเกจ"
@@ -2896,7 +2882,7 @@ msgstr "กำลังอ่านรายชื่อแพกเกจ"
msgid "Collecting File Provides"
msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
@@ -3143,49 +3129,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "จะล้มเลิกการติดตั้ง"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "ไม่พบรุ่น '%s' ของ '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "ไม่พบงาน %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "ไม่พบแพกเกจ %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3210,117 +3196,117 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "กำลังติดตั้ง %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "กำลังตั้งค่า %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "กำลังถอดถอน %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "ไม่มีไดเรกทอรี '%s'"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "ไม่สามารถเปิดแฟ้ม %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "กำลังเตรียม %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "กำลังแตกแพกเกจ %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "กำลังเตรียมตั้งค่า %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "ติดตั้ง %s แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "กำลังเตรียมถอดถอน %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "ถอดถอน %s แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
"หรือเปล่า?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3332,7 +3318,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3361,6 +3353,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
+#~ "ออกมาจากแพกเกจเดเบียน\n"
+#~ "\n"
+#~ "ตัวเลือก:\n"
+#~ " -h แสดงข้อความช่วยเหลือนี้\n"
+#~ " -t กำหนดไดเรกทอรีทำงานชั่วคราว\n"
+#~ " -c=? อ่านแฟ้มค่าตั้งนี้\n"
+#~ " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "ไม่สามารถลบ %s"
diff --git a/po/tl.po b/po/tl.po
index 666d3245c..0d6a3a758 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -116,7 +116,7 @@ msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Hindi mahanap ang paketeng %s"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -301,7 +301,7 @@ msgstr "O"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -607,8 +607,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -645,7 +645,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -654,7 +654,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -846,33 +846,28 @@ msgstr "Error na internal, may nasira ang problem resolver"
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -880,85 +875,85 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -967,7 +962,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -976,14 +971,14 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
"%s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -992,7 +987,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1001,30 +996,30 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1109,7 +1104,7 @@ msgstr ""
"para sa karagdagang impormasyon at mga option.\n"
" Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1180,7 +1175,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1204,7 +1199,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1581,8 +1576,8 @@ msgstr "Internal na error"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -2029,11 +2024,10 @@ msgid "Failed to rename %s to %s"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2041,17 +2035,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
-"sa pagkaayos at template mula sa mga paketeng debian\n"
-"\n"
-"Mga opsyon:\n"
-" -h Itong tulong na ito\n"
-" -t Itakda ang dir na pansamantala\n"
-" -c=? Basahin ang talaksang pagkaayos na ito\n"
-" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2271,26 +2257,26 @@ msgstr "Hindi ma-invoke "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2855,12 +2841,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2957,7 +2943,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
@@ -2965,7 +2951,7 @@ msgstr "Binabasa ang Listahan ng mga Pakete"
msgid "Collecting File Provides"
msgstr "Kinukuha ang Talaksang Provides"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
@@ -3222,49 +3208,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Ina-abort ang pag-instol."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3289,115 +3275,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Isasaayos ang %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Tinatanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Hindi mabuksan ang talaksang %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Hinahanda ang %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Binubuklat ang %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Hinahanda ang %s upang isaayos"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Naghahanda para sa pagtanggal ng %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Tinanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3409,7 +3395,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3438,6 +3430,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+#~ "\n"
+#~ "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+#~ "sa pagkaayos at template mula sa mga paketeng debian\n"
+#~ "\n"
+#~ "Mga opsyon:\n"
+#~ " -h Itong tulong na ito\n"
+#~ " -t Itakda ang dir na pansamantala\n"
+#~ " -c=? Basahin ang talaksang pagkaayos na ito\n"
+#~ " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Bigo sa pagtanggal ng %s"
diff --git a/po/uk.po b/po/uk.po
index 3ce9dbc9f..52b5be7d7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2006-07-29 15:57+0300\n"
"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "Ви повинні задати рівно один шаблон"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Не можу знайти пакунок %s"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -294,7 +294,7 @@ msgstr "Т"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -601,8 +601,8 @@ msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
@@ -641,7 +641,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Т/н]? "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -650,7 +650,7 @@ msgstr "Не вдалося завантажити %s %s\n"
msgid "Some files failed to download"
msgstr "Деякі файли не вдалося завантажити"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
@@ -845,35 +845,30 @@ msgstr "Внутрішня помилка, вирішувач проблем в
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати теку для завантаження"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -881,89 +876,89 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостатньо місця в %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
"розпаковані вихідні тексти\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -971,7 +966,7 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -979,14 +974,14 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
"пакунок %s новіше, аніж треба"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -995,7 +990,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
"пакунка %s не задовольняє умови"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1003,30 +998,30 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "З'єднання з %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1115,7 +1110,7 @@ msgstr ""
"містять більше інформації.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1184,7 +1179,7 @@ msgid "%s was already not hold.\n"
msgstr "Вже встановлена найновіша версія %s.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікується на %s але його тут немає"
@@ -1208,7 +1203,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1588,8 +1583,8 @@ msgstr "Внутрішня помилка"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Неможливо прочитати %s"
@@ -2041,11 +2036,10 @@ msgid "Failed to rename %s to %s"
msgstr "Не вдалося перейменувати %s в %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2053,17 +2047,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Використання: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
-"і файли-шаблони\n"
-"\n"
-"Опції:\n"
-" -h Цей текст\n"
-" -t Встановити теку для тимчасових файлів\n"
-" -c=? Читати зазначений конфігураційний файл\n"
-" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2286,26 +2272,26 @@ msgstr "Неможливо викликати "
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неможливо відобразити в пам'яті %lu байт"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
#, fuzzy
msgid "Failed to truncate file"
msgstr "Не вдалося записати файл %s"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2873,12 +2859,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Система пакування '%s' не підтримується"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Неможливо визначити тип необхідної системи пакування "
@@ -2970,7 +2956,7 @@ msgid "Couldn't stat source package list %s"
msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Читання переліків пакетів"
@@ -2979,7 +2965,7 @@ msgstr "Читання переліків пакетів"
msgid "Collecting File Provides"
msgstr "Збирання інформації про файлів "
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Помилка IO під час збереження джерельного кешу"
@@ -3232,49 +3218,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Переривається встановлення."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Реліз '%s' для '%s' не знайдений"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версія '%s' для '%s' не знайдена"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Не можу знайти пакунок %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не можу знайти пакунок %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3299,116 +3285,116 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Встановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Конфігурація %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Видаляється %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Lists тека %spartial відсутня."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Не можливо відкрити файл %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Підготовка %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Розпакування %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Підготовка до конфігурації %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Встановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Підготовка до видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Підготовка до повного видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3420,7 +3406,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3449,6 +3441,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "Використання: apt-extracttemplates file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
+#~ "і файли-шаблони\n"
+#~ "\n"
+#~ "Опції:\n"
+#~ " -h Цей текст\n"
+#~ " -t Встановити теку для тимчасових файлів\n"
+#~ " -c=? Читати зазначений конфігураційний файл\n"
+#~ " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Невдача видалення %s"
diff --git a/po/vi.po b/po/vi.po
index 034c5d612..27b530561 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-09-29 21:36+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -109,7 +109,7 @@ msgstr "Bạn phải đưa ra ít nhất 1 chuỗi tìm kiếm"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "Không thể định vị gói %s"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -301,7 +301,7 @@ msgstr "C"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -601,8 +601,8 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -640,7 +640,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [C/k] "
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc lấy %s bị lỗi %s\n"
@@ -649,7 +649,7 @@ msgstr "Việc lấy %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -842,26 +842,21 @@ msgstr "Lỗi nội bộ : bộ tháo gỡ vấn đề đã ngắt gì"
msgid "Unable to lock the download directory"
msgstr "Không thể khoá thư mục tải về"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cho đó cần lấy mã nguồn"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -871,7 +866,7 @@ msgstr ""
"bản « %s » tại:\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -882,106 +877,106 @@ msgstr ""
"bzr get %s\n"
"để lấy các bản cập nhật gói mới nhất (có thể là chưa phát hành).\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -990,37 +985,37 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Đang kết nối đến %s (%s)..."
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1116,7 +1111,7 @@ msgstr ""
"sources.list(5) và apt.conf(5).\n"
" Trình APT này có năng lực của siêu bò.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1191,7 +1186,7 @@ msgid "%s was already not hold.\n"
msgstr "%s là phiên bản mơi nhất.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Đã đợi %s nhưng mà chưa gặp nó"
@@ -1215,7 +1210,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1592,8 +1587,8 @@ msgstr "Gặp lỗi nội bộ"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
@@ -2055,11 +2050,10 @@ msgid "Failed to rename %s to %s"
msgstr "Việc đổi tên %s thành %s bị lỗi"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2067,21 +2061,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[extract: \t\trút;\n"
-"templates: \tnhững biểu 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 \t\t_Trợ giúp_ này\n"
-" -t \t\tLập thư muc tạm thời\n"
-"\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n"
-" -c=? \t\tĐọc tập tin cấu hình này\n"
-" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2301,11 +2283,11 @@ msgstr "Không thể động bộ hoá mmap (ảnh xạ bộ nhớ)"
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/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "Lỗi cắt ngắn tập tin"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2315,14 +2297,14 @@ msgstr ""
"Hãy tăng kích cỡ của « APT::Cache-Limit » (giới hạn vùng nhớ tạm Apt).\n"
"Giá trị hiện thời: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, 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:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2890,12 +2872,12 @@ msgstr "Phương pháp %s đã không bắt đầu cho đúng."
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
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"
@@ -2990,7 +2972,7 @@ 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/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "Đang đọc các danh sách gói..."
@@ -2998,7 +2980,7 @@ msgstr "Đang đọc các danh sách gói..."
msgid "Collecting File Provides"
msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
@@ -3260,32 +3242,32 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "Không có vòng khoá nào được cài đặt vào %s."
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, 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 »"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, 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/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Không tìm thấy tác vụ « %s »"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, 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/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, 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/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3294,17 +3276,17 @@ 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ó"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, 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"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, 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ử"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3331,110 +3313,110 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Đang cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Đang cấu hình %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Đang gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Đang gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Đang ghi lưu sự biến mất của %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Thiếu thư mục « %s »"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Không thể mở tập tin « %s »"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Đang chuẩn bị %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Đang mở gói %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Đang chuẩn bị cấu hình %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Đã cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Đang chuẩn bị gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Đã gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "Đang chạy dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
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)"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không có cấu hình"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3442,7 +3424,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý rằng nó là một lỗi kế tiếp "
"do một sự thất bại trước."
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3455,7 +3437,14 @@ msgid ""
msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi « không đủ bộ nhớ »"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+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 ngụ ý một lỗi « đĩa đầy »"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
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 ngụ ý một lỗi « V/R dpkg »"
@@ -3487,6 +3476,35 @@ msgstr ""
msgid "Not locked"
msgstr "Không phải bị khoá"
+#, fuzzy
+#~ 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 sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
+#~ "\n"
+#~ "[extract: \t\trút;\n"
+#~ "templates: \tnhững biểu 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 \t\t_Trợ giúp_ này\n"
+#~ " -t \t\tLập thư muc tạm thời\n"
+#~ "\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n"
+#~ " -c=? \t\tĐọc tập tin cấu hình này\n"
+#~ " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp "
+#~ "»\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Việc gỡ bỏ %s bị lỗi"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2b1a86636..f5bbae1fd 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -111,7 +111,7 @@ msgstr "您必须明确地给出至少一个表达式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " 版本列表："
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -293,7 +293,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -589,8 +589,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
@@ -627,7 +627,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -636,7 +636,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
@@ -821,26 +821,21 @@ msgstr "内部错误，问题解决工具坏事了"
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -849,7 +844,7 @@ msgstr ""
"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
"%s\n"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -860,104 +855,104 @@ msgstr ""
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的可用空间"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -966,37 +961,37 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "支持的模块："
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1084,7 +1079,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1153,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
@@ -1182,7 +1177,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1552,8 +1547,8 @@ msgstr "内部错误"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1988,11 +1983,10 @@ msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -2000,17 +1994,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-" -h 本帮助文本\n"
-" -t 设置 temp 目录\n"
-" -c=? 读指定的配置文件\n"
-" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2226,11 +2212,11 @@ msgstr "无法同步 mmap "
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "无法截断文件"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2239,14 +2225,14 @@ msgstr ""
"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
@@ -2801,12 +2787,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2897,7 +2883,7 @@ msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -2905,7 +2891,7 @@ msgstr "正在读取软件包列表"
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -3158,49 +3144,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本，无法进行选择"
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
@@ -3225,115 +3211,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3345,7 +3331,14 @@ msgid ""
"error"
msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
@@ -3374,6 +3367,30 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#, fuzzy
+#~ 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 ""
+#~ "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+#~ "信息的工具\n"
+#~ "\n"
+#~ "选项：\n"
+#~ " -h 本帮助文本\n"
+#~ " -t 设置 temp 目录\n"
+#~ " -c=? 读指定的配置文件\n"
+#~ " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "无法卸载 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 573c48b1c..0c66dec64 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-06-26 13:47+0200\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -112,7 +112,7 @@ msgstr "您必須明確得給定一個樣式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462
#, c-format
msgid "Unable to locate package %s"
msgstr "找不到套件 %s"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " 版本列表："
#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-get.cc:3341 cmdline/apt-mark.cc:363
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -294,7 +294,7 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -590,8 +590,8 @@ msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2580
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
@@ -628,7 +628,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "是否繼續進行 [Y/n]？"
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2642 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s，%s\n"
@@ -637,7 +637,7 @@ msgstr "無法取得 %s，%s\n"
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2654
msgid "Download complete and in download only mode"
msgstr "下載完成，且這是『僅下載』模式"
@@ -828,33 +828,28 @@ msgstr "內部錯誤，問題排除器造成了損壞"
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2381
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2439
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2479 cmdline/apt-get.cc:2791
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2496
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"Please use:\n"
@@ -862,104 +857,104 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2591
#, c-format
msgid "You don't have enough free space in %s"
msgstr "在 %s 裡沒有足夠的的未使用空間"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2611
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2649
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2680
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開，因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2715
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2735
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2754
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2779
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2826
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:2985
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3003
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:3038
+#: cmdline/apt-get.cc:3026
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:3077
+#: cmdline/apt-get.cc:3065
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -967,37 +962,37 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3071
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3094
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3110
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3115
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3346
msgid "Supported modules:"
msgstr "已支援模組："
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3387
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1083,7 +1078,7 @@ msgstr ""
"以取得更多資訊和選項。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3552
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1154,7 +1149,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -1178,7 +1173,7 @@ msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
+"as manual or automatical installed. It can also list marks.\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
@@ -1548,8 +1543,8 @@ msgstr "內部錯誤"
#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
@@ -1985,11 +1980,10 @@ msgid "Failed to rename %s to %s"
msgstr "無法將 %s 更名為 %s"
#: cmdline/apt-internal-solver.cc:37
-#, fuzzy
msgid ""
-"Usage: apt-internal-solver\n"
+"Usage: apt-internal-resolver\n"
"\n"
-"apt-internal-solver is an interface to use the current internal\n"
+"apt-internal-resolver 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"
@@ -1997,17 +1991,9 @@ msgid ""
" -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.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
msgstr ""
-"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
-"的工具\n"
-"\n"
-"選項\n"
-" -h 本幫助訊息。\n"
-" -t 指定暫存目錄\n"
-" -c=? 讀取指定的設定檔\n"
-" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2224,11 +2210,11 @@ msgstr "無法 invoke "
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法 mmap 到 %lu 位元組"
-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:312
msgid "Failed to truncate file"
msgstr "無法截短檔案"
-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:331
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2237,14 +2223,14 @@ msgstr ""
"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
"(man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:430
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:433
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2793,12 +2779,12 @@ msgstr "安裝方式 %s 沒有正確啟動"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支援的套件包裝系統 '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "無法確認合適的套件包裝系統類型"
@@ -2889,7 +2875,7 @@ msgid "Couldn't stat source package list %s"
msgstr "無法取得來源套件列表 %s 的狀態"
#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1442
msgid "Reading package lists"
msgstr "正在讀取套件清單"
@@ -2897,7 +2883,7 @@ msgstr "正在讀取套件清單"
msgid "Collecting File Provides"
msgstr "正在收集檔案提供者"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1384 apt-pkg/pkgcachegen.cc:1391
msgid "IO Error saving source cache"
msgstr "在儲存來源快取時 IO 錯誤"
@@ -3144,49 +3130,49 @@ msgstr ""
msgid "No keyring installed in %s."
msgstr "放棄安裝。"
-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:355
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:358
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "找不到 '%s' 版的 '%s'"
-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:469
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "無法找到主題 %s"
-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:475
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "無法找到套件 %s"
-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:486
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:493 apt-pkg/cacheset.cc:500
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3211,115 +3197,115 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "正在執行安裝後套件後續處理程式 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "找不到 '%s' 目錄"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "無法開啟檔案 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在準備 %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解開 %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在準備設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1472
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1479
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3331,7 +3317,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3360,6 +3352,30 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ 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 ""
+#~ "用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
+#~ "\n"
+#~ "apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+#~ "的工具\n"
+#~ "\n"
+#~ "選項\n"
+#~ " -h 本幫助訊息。\n"
+#~ " -t 指定暫存目錄\n"
+#~ " -c=? 讀取指定的設定檔\n"
+#~ " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+
#~ msgid "Failed to remove %s"
#~ msgstr "無法移除 %s"
diff --git a/prepare-release b/prepare-release
index 73c0be602..8cf4ccace 100755
--- a/prepare-release
+++ b/prepare-release
@@ -1,11 +1,15 @@
#!/bin/sh
+set -e
+
VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')"
LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+dpkg-checkbuilddeps -d 'libxml2-utils'
+
if [ "$1" = 'pre-export' ]; then
libraryversioncheck() {
local LIBRARY="$1"
diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note
new file mode 100644
index 000000000..3e8a9e71d
--- /dev/null
+++ b/share/apt-auth-failure.note
@@ -0,0 +1,11 @@
+_Name: Apt Authentication issue
+Priority: High
+Terminal: False
+Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window
+GettextDomain: apt
+_Description: Problem during package list update.
+ The package list update failed with a authentication failure.
+ This usually happens behind a network proxy server. Please try
+ to click on the "Run this action now" button to correct the problem or
+ update the list manually by running Update Manager and clicking
+ on "Check".
diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg
new file mode 100644
index 000000000..2ce60d454
--- /dev/null
+++ b/share/ubuntu-archive.gpg
Binary files differ
diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub
new file mode 100644
index 000000000..642952a40
--- /dev/null
+++ b/test/integration/exploid-keyring-with-dupe-keys.pub
Binary files differ
diff --git a/test/integration/exploid-keyring-with-dupe-subkeys.pub b/test/integration/exploid-keyring-with-dupe-subkeys.pub
new file mode 100644
index 000000000..02d4e6ee8
--- /dev/null
+++ b/test/integration/exploid-keyring-with-dupe-subkeys.pub
Binary files differ
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
new file mode 100755
index 000000000..d5205836f
--- /dev/null
+++ b/test/integration/test-apt-key-net-update
@@ -0,0 +1,95 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+# mock
+requires_root() {
+ return 0
+}
+
+# extract net_update() and import it
+func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key )
+eval "$func"
+
+mkdir -p ./etc/apt
+TRUSTEDFILE=./etc/apt/trusted.gpg
+mkdir -p ./var/lib/apt/keyrings
+TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
+GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
+GPG="$GPG_CMD --keyring $TRUSTEDFILE"
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+
+
+msgtest "add_keys_with_verify_against_master_keyring"
+if [ ! -e $MASTER_KEYRING ]; then
+ echo -n "No $MASTER_KEYRING found"
+ msgskip
+ exit 0
+fi
+
+# test bad keyring and ensure its not added (LP: #857472)
+ADD_KEYRING=./keys/exploid-keyring-with-dupe-keys.pub
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgfail
+else
+ msgpass
+fi
+
+# ensure the keyring is still empty
+gpg_out=$($GPG --list-keys)
+msgtest "Test if keyring is empty"
+if [ -n "" ]; then
+ msgfail
+else
+ msgpass
+fi
+
+
+# test another possible attack vector using subkeys (LP: #1013128)
+msgtest "add_keys_with_verify_against_master_keyring with subkey attack"
+ADD_KEYRING=./keys/exploid-keyring-with-dupe-subkeys.pub
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgfail
+else
+ msgpass
+fi
+
+# ensure the keyring is still empty
+gpg_out=$($GPG --list-keys)
+msgtest "Test if keyring is empty"
+if [ -n "" ]; then
+ msgfail
+else
+ msgpass
+fi
+
+
+# test good keyring and ensure we get no errors
+ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgpass
+else
+ msgfail
+fi
+
+testequal './etc/apt/trusted.gpg
+---------------------
+pub 1024D/437D05B5 2004-09-12
+uid Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>
+sub 2048g/79164387 2004-09-12
+
+pub 1024D/FBB75451 2004-12-30
+uid Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>
+
+pub 4096R/C0B21F32 2012-05-11
+uid Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>
+
+pub 4096R/EFE21092 2012-05-11
+uid Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>
+' $GPG --list-keys
+
diff --git a/test/integration/test-bug-666772-multiarch-arch-all-build-deps b/test/integration/test-bug-666772-multiarch-arch-all-build-deps
new file mode 100755
index 000000000..cfae1fef3
--- /dev/null
+++ b/test/integration/test-bug-666772-multiarch-arch-all-build-deps
@@ -0,0 +1,118 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'armhf'
+
+insertinstalledpackage 'build-essential' 'all' '11.5'
+
+insertpackage 'unstable' 'doxygen' 'all' '1.0' 'Depends: language-support, language-tool'
+insertpackage 'unstable' 'libc6' 'amd64,armhf' '1.0' 'Multi-Arch: same'
+insertpackage 'unstable' 'libc6-dev' 'amd64,armhf' '1.0' 'Depends: libc6
+Multi-Arch: same'
+insertpackage 'unstable' 'language-support' 'amd64,armhf' '1.0' 'Multi-Arch: foreign'
+insertpackage 'unstable' 'language-tool' 'amd64,armhf' '1.0'
+
+insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6 libc6-dev
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [amd64])
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [amd64])
+Inst libc6-dev (1.0 unstable [amd64])
+Conf language-support (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [amd64])
+Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6:armhf libc6-dev:armhf
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [amd64])
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:armhf (1.0 unstable [armhf])
+Inst libc6-dev:armhf (1.0 unstable [armhf])
+Conf language-support (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:armhf (1.0 unstable [armhf])
+Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf
+
+configarchitecture 'armhf' 'amd64'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6 libc6-dev
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [armhf])
+Inst language-tool (1.0 unstable [armhf])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [armhf])
+Inst libc6-dev (1.0 unstable [armhf])
+Conf language-support (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [armhf])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [armhf])
+Conf libc6-dev (1.0 unstable [armhf])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6:amd64 libc6-dev:amd64
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [armhf])
+Inst language-tool (1.0 unstable [armhf])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:amd64 (1.0 unstable [amd64])
+Inst libc6-dev:amd64 (1.0 unstable [amd64])
+Conf language-support (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [armhf])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:amd64 (1.0 unstable [amd64])
+Conf libc6-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64
+
+configarchitecture 'amd64' 'armhf'
+
+insertinstalledpackage 'language-support' 'armhf' '0.5' 'Multi-Arch: foreign'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-tool libc6 libc6-dev
+0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded.
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [amd64])
+Inst libc6-dev (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [amd64])
+Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-tool libc6:armhf libc6-dev:armhf
+0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded.
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:armhf (1.0 unstable [armhf])
+Inst libc6-dev:armhf (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:armhf (1.0 unstable [armhf])
+Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 09:42:10 +0000