summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/netrc.cc21
-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--configure.in2
-rw-r--r--debian/apt.conf.changelog6
-rw-r--r--debian/apt.cron.daily12
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog2607
-rw-r--r--debian/control11
-rwxr-xr-xdebian/rules5
-rw-r--r--doc/apt-key.8.xml10
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/examples/sources.list.in12
-rw-r--r--doc/makefile2
-rw-r--r--doc/po/apt-doc.pot16
-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--ftparchive/override.cc4
-rw-r--r--po/apt-all.pot76
-rw-r--r--po/ar.po76
-rw-r--r--po/ast.po88
-rw-r--r--po/bg.po88
-rw-r--r--po/bs.po89
-rw-r--r--po/ca.po88
-rw-r--r--po/cs.po88
-rw-r--r--po/cy.po76
-rw-r--r--po/da.po90
-rw-r--r--po/de.po88
-rw-r--r--po/dz.po76
-rw-r--r--po/el.po92
-rw-r--r--po/es.po88
-rw-r--r--po/eu.po85
-rw-r--r--po/fi.po76
-rw-r--r--po/fr.po88
-rw-r--r--po/gl.po88
-rw-r--r--po/hu.po94
-rw-r--r--po/it.po94
-rw-r--r--po/ja.po167
-rw-r--r--po/km.po76
-rw-r--r--po/ko.po87
-rw-r--r--po/ku.po76
-rw-r--r--po/lt.po76
-rw-r--r--po/mr.po76
-rw-r--r--po/nb.po88
-rw-r--r--po/ne.po76
-rw-r--r--po/nl.po88
-rw-r--r--po/nn.po76
-rw-r--r--po/pl.po138
-rw-r--r--po/pt.po131
-rw-r--r--po/pt_BR.po76
-rw-r--r--po/ro.po76
-rw-r--r--po/ru.po98
-rw-r--r--po/sk.po88
-rw-r--r--po/sl.po96
-rw-r--r--po/sv.po88
-rw-r--r--po/th.po76
-rw-r--r--po/tl.po76
-rw-r--r--po/uk.po76
-rw-r--r--po/vi.po87
-rw-r--r--po/zh_CN.po86
-rw-r--r--po/zh_TW.po85
-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
77 files changed, 5266 insertions, 1741 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 56e59d84b..2321ef063 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -15,6 +15,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <iostream>
@@ -39,8 +40,8 @@ enum {
};
/* make sure we have room for at least this size: */
-#define LOGINSIZE 64
-#define PASSWORDSIZE 64
+#define LOGINSIZE 256
+#define PASSWORDSIZE 256
#define NETRC DOT_CHAR "netrc"
/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
@@ -122,11 +123,21 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
if (specific_login)
state_our_login = !strcasecmp (login, tok);
else
+ {
+ if (strlen(tok) > LOGINSIZE)
+ _error->Error("login token too long %i (max: %i)",
+ strlen(tok), LOGINSIZE);
strncpy (login, tok, LOGINSIZE - 1);
+ }
state_login = 0;
} else if (state_password) {
- if (state_our_login || !specific_login)
+ if (state_our_login || !specific_login)
+ {
+ if (strlen(tok) > PASSWORDSIZE)
+ _error->Error("password token too long %i (max %i)",
+ strlen(tok), PASSWORDSIZE);
strncpy (password, tok, PASSWORDSIZE - 1);
+ }
state_password = 0;
} else if (!strcasecmp ("login", tok))
state_login = 1;
@@ -162,8 +173,8 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
{
if (NetRCFile.empty () == false)
{
- char login[64] = "";
- char password[64] = "";
+ char login[LOGINSIZE] = "";
+ char password[PASSWORDSIZE] = "";
char *netrcfile = strdup(NetRCFile.c_str());
// first check for a generic host based netrc entry
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 b93bf6ab9..97a3c8c88 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 4e307b657..4bbe0c492 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2941,7 +2941,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);
@@ -2959,7 +2959,7 @@ bool DoBuildDep(CommandLine &CmdL)
else if (strcmp(D->Package.c_str() + colon, ":native") == 0)
Pkg = Ver.ParentPkg().Group().FindPkg("native");
}
- 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)
Pkg = Ver.ParentPkg().Group().FindPkg("native");
@@ -3250,7 +3250,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/configure.in b/configure.in
index f7afe72a4..6f53f1dfa 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.4"
+PACKAGE_VERSION="0.9.7.1ubuntu3"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
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 5c00f22db..4d1bbf085 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -436,6 +436,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
@@ -449,6 +456,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 6df67057c..28a48fef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
+apt (0.9.7.5ubuntu1) UNRELEASEDquantal; urgency=low
+
+ [ Michael Vogt ]
+ * merged from debian-sid
+
+ [ TJ ]
+ * apt-pkg/contrib/netrc.cc:
+ - increase LOGINSIZE/PASSWORDSIZE limits and add proper error
+ if the limits are reached (LP: #1008289)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Aug 2012 12:00:17 +0200
+
apt (0.9.7.5) UNRELEASED; urgency=low
[ Manpages translation updates ]
* Japanese (KURASAWA Nozomu) (Closes: #684435)
-
-- Christian Perrier <bubulle@debian.org> Fri, 10 Aug 2012 07:52:17 +0200
apt (0.9.7.4) unstable; urgency=low
@@ -108,6 +119,19 @@ apt (0.9.7.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 13 Jul 2012 21:33:56 +0200
+apt (0.9.7.1ubuntu2) quantal; urgency=low
+
+ * ftparchive/override.cc:
+ - Double maximum override line length to 1000 (LP: #1038961).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 Aug 2012 12:04:30 +0100
+
+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 ]
@@ -166,6 +190,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 ]
@@ -676,6 +738,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 ]
@@ -733,10 +941,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:
@@ -771,6 +979,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
@@ -868,15 +1077,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
@@ -1002,6 +1394,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:
@@ -1025,8 +1421,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
@@ -1154,6 +1550,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 ]
@@ -1162,6 +1566,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 ]
@@ -1226,6 +1652,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
@@ -1233,6 +1692,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 ]
@@ -1256,6 +1733,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 ]
@@ -1544,6 +2032,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:
@@ -1586,6 +2169,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 ]
@@ -1622,6 +2241,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
@@ -1629,6 +2254,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 ]
@@ -1650,6 +2293,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 ]
@@ -1703,6 +2369,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 ]
@@ -1934,6 +2617,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 ]
@@ -1953,6 +2657,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 ]
@@ -1984,6 +2730,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 ]
@@ -2003,6 +2790,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 ]
@@ -2121,6 +2919,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 ]
@@ -2213,6 +3097,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 ]
@@ -2255,6 +3202,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 ]
@@ -2297,6 +3258,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 ]
@@ -2911,6 +3922,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 ]
@@ -3031,6 +4188,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 ]
@@ -3174,6 +4364,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 ]
@@ -3243,6 +4456,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 ]
@@ -3472,6 +4738,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 ]
@@ -3515,6 +4809,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 ]
@@ -3583,6 +4996,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 ]
@@ -3881,6 +5300,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 ]
@@ -4107,6 +5610,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 ]
@@ -4232,6 +5997,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
@@ -4259,6 +6211,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 ]
@@ -4319,6 +6279,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.
@@ -4441,6 +6485,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
@@ -4470,6 +6624,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.
@@ -4582,6 +6756,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:
@@ -4627,6 +6968,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
@@ -4715,6 +7087,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:
@@ -4747,6 +7139,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:
@@ -4770,6 +7194,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:
@@ -4793,6 +7235,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:
@@ -4813,6 +7268,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:
@@ -4919,6 +7390,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
@@ -4928,6 +7473,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
@@ -4943,6 +7494,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
@@ -4955,6 +7539,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/apt-verbatim.ent b/doc/apt-verbatim.ent
index a66ce8f4d..c5fcdce08 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.4">
+<!ENTITY apt-product-version "0.9.7.1ubuntu3">
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "squeeze">
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..532edd099 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.7\n"
+"Project-Id-Version: apt-doc 0.9.7.1ubuntu1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-29 14:26+0300\n"
+"POT-Creation-Date: 2012-08-20 12:04+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"
@@ -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 f6e158109..1c4c21565 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -2261,12 +2261,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 "
@@ -2335,24 +2342,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 4c3626090..4a88e718c 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -2334,8 +2334,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 ""
"Actualiza el registro de claves local con el registro de claves del archivo "
"y elimina del registro local las claves de archivo que ya no son válidas. El "
@@ -2404,24 +2404,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 189d1924e..ca4073748 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -2390,8 +2390,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 ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de "
@@ -2460,24 +2460,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 ba6796a1e..b1c3926ef 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -2219,8 +2219,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 ""
"ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
"イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
@@ -2287,24 +2287,33 @@ 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>
#: 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>
#: 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 da377d976..f1e5e8f32 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -2366,8 +2366,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 "
@@ -2436,24 +2436,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/ftparchive/override.cc b/ftparchive/override.cc
index 760c20120..af8ec3a8f 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
- char Line[500];
+ char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
@@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
- char Line[500];
+ char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 8048c9a34..a53c4b579 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.9.6\n"
+"Project-Id-Version: apt 0.9.7.1ubuntu1\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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -921,11 +921,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -971,7 +971,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1039,7 +1039,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 ""
@@ -1430,8 +1430,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 ""
@@ -2595,12 +2595,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 ""
@@ -3007,115 +3007,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 +3127,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 2c168a4b5..74467d4ba 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -939,11 +939,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -989,7 +989,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1060,7 +1060,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 ""
@@ -1455,8 +1455,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"
@@ -2071,7 +2071,7 @@ msgstr "فشلت كتابة الملف %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2626,12 +2626,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 ""
@@ -3042,115 +3042,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 +3162,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 6432dcc26..d29a2b6c4 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1016,11 +1016,11 @@ msgstr "Fallu al procesar les dependencies de construcción"
msgid "Changelog for %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1111,7 +1111,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1187,7 +1187,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í"
@@ -1585,8 +1585,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"
@@ -2280,11 +2280,11 @@ msgstr "Falló al francer el ficheru"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
-"Start. El valor actual ye : %lu. (man 5 apt.conf)"
+"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2857,12 +2857,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"
@@ -3298,111 +3298,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 +3410,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 +3426,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 +3470,13 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
+#~ "Start. El valor actual ye : %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Nun ye a desaniciar %s"
diff --git a/po/bg.po b/po/bg.po
index 2e4851e55..0739e232f 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1031,11 +1031,11 @@ msgstr "Неуспех при обработката на зависимости
msgid "Changelog for %s (%s)"
msgstr "Журнал на промените в %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1125,7 +1125,7 @@ msgstr ""
"информация и опции.\n"
" Това APT има Върховни Сили.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1200,7 +1200,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, но той не беше пуснат"
@@ -1622,8 +1622,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"
@@ -2317,11 +2317,11 @@ msgstr "Неуспех при отрязване на края на файла"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
-"Start. Текуща стойност: %lu (man 5 apt.conf)"
+"Limit. Текуща стойност: %lu (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2904,12 +2904,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 "Неуспех при определянето на подходяща пакетна система"
@@ -3355,113 +3355,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 +3469,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 +3485,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 +3530,13 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::"
+#~ "Cache-Start. Текуща стойност: %lu (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Неуспех при премахването на %s"
diff --git a/po/bs.po b/po/bs.po
index a92636f49..b22ad9273 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -940,11 +940,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -990,7 +990,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1058,7 +1058,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 ""
@@ -1453,8 +1453,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"
@@ -1841,6 +1841,7 @@ msgid "Failed to rename %s to %s"
msgstr ""
#: cmdline/apt-internal-solver.cc:37
+#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -1853,6 +1854,18 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Upotreba: apt-config [opcije] naredba\n"
+"\n"
+"apt-config je jednostavni alat za čitanje APT konfiguracijske datoteke\n"
+"\n"
+"Naredbe:\n"
+" shell - Shell mod\n"
+" dump - Prikaz konfiguracije\n"
+"\n"
+"Opcije:\n"
+" -h Ovaj tekst pomoći.\n"
+" -c=? Pročitaj ovu konfiguracijsku datoteku\n"
+" -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -2068,7 +2081,7 @@ msgstr "Ne mogu ukloniti %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2624,12 +2637,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 ""
@@ -3039,115 +3052,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 +3172,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 2581433db..10f09ef44 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1032,11 +1032,11 @@ msgstr "No es poden processar les dependències de construcció"
msgid "Changelog for %s (%s)"
msgstr "Registre de canvis per a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1126,7 +1126,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1201,7 +1201,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"
@@ -1624,8 +1624,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"
@@ -2316,11 +2316,11 @@ msgstr "No s'ha pogut truncar el fitxer %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
-"Start. Valor actual: %lu. (man 5 apt.conf)"
+"Limit. Valor actual: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2901,12 +2901,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."
@@ -3354,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 "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 +3466,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 +3482,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 +3526,13 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
+#~ "Start. Valor actual: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "No es pot suprimir %s"
diff --git a/po/cs.po b/po/cs.po
index 60cc2d62c..0aff59ae2 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-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -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:3353 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
@@ -1017,11 +1017,11 @@ msgstr "Chyba při zpracování závislostí pro sestavení"
msgid "Changelog for %s (%s)"
msgstr "Seznam změn %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1108,7 +1108,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tato APT má schopnosti svaté krávy.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1183,7 +1183,7 @@ msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\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"
@@ -1598,8 +1598,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"
@@ -2282,10 +2282,10 @@ msgstr "Nelze zmenšit soubor"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. "
+"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
@@ -2852,12 +2852,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"
@@ -3288,110 +3288,110 @@ msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
msgid "Execute external solver"
msgstr "Spuštění externího řešitele"
-#: 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 "Operace byla přerušena dříve, než mohla skončit"
-#: 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."
@@ -3399,7 +3399,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"
@@ -3415,7 +3415,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 ""
@@ -3446,6 +3455,13 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. "
+#~ "Současná hodnota: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Selhalo odstranění %s"
diff --git a/po/cy.po b/po/cy.po
index ecddc2749..92950f779 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1042,13 +1042,13 @@ msgstr "Methwyd prosesu dibyniaethau adeiladu"
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1135,7 +1135,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1206,7 +1206,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"
@@ -1616,8 +1616,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"
@@ -2320,7 +2320,7 @@ msgstr "Methwyd ysgrifennu ffeil %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2908,12 +2908,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"
@@ -3342,115 +3342,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 +3462,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/da.po b/po/da.po
index 2efc7242b..9dad8b62a 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-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-07-03 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -159,7 +159,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:3353 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
@@ -451,7 +451,8 @@ msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n"
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken »%s« er ikke installeret, så den afinstalleres ikke. Mente du »%s«?\n"
+msgstr ""
+"Pakken »%s« er ikke installeret, så den afinstalleres ikke. Mente du »%s«?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
@@ -1021,11 +1022,11 @@ msgstr "Kunne ikke behandler opbygningsafhængighederne"
msgid "Changelog for %s (%s)"
msgstr "Ændringslog for %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1113,7 +1114,7 @@ msgstr ""
"for flere oplysninger og tilvalg.\n"
" Denne APT har »Super Cow Powers«.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1188,7 +1189,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"
@@ -1608,8 +1609,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"
@@ -2302,10 +2303,10 @@ msgstr "Kunne ikke afkorte filen"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. "
+"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
@@ -2874,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"
@@ -3313,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."
@@ -3424,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"
@@ -3439,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"
@@ -3469,6 +3478,13 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-"
+#~ "Start. Aktuel værdi: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Kunne ikke slette %s"
diff --git a/po/de.po b/po/de.po
index 860a00fe9..4c3f3fc19 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1052,11 +1052,11 @@ msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
msgid "Changelog for %s (%s)"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1151,7 +1151,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1228,7 +1228,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"
@@ -1662,8 +1662,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."
@@ -2364,11 +2364,11 @@ msgstr "Datei konnte nicht eingekürzt werden."
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::"
-"Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2954,12 +2954,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"
@@ -3417,113 +3417,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 +3531,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 +3547,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 +3592,13 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von "
+#~ "APT::Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s konnte nicht entfernt werden."
diff --git a/po/dz.po b/po/dz.po
index b43fb305c..c5366a91f 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1010,11 +1010,11 @@ msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འད
msgid "Changelog for %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1103,7 +1103,7 @@ msgstr ""
"ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1174,7 +1174,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་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1575,8 +1575,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་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -2273,7 +2273,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2841,12 +2841,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 "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
@@ -3268,115 +3268,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 +3388,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/el.po b/po/el.po
index 3e8dd8dea..2b6895c08 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-08-20 12:04+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -165,7 +165,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:3353 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
@@ -249,7 +249,8 @@ msgstr ""
#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'"
+msgstr ""
+"Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'"
#: cmdline/apt-cdrom.cc:94
msgid "Please insert a Disc in the drive and press enter"
@@ -463,7 +464,8 @@ msgstr "Εικονικά πακέτα όπως το '%s' δεν μπορούν
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n"
+msgstr ""
+"Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
@@ -755,8 +757,7 @@ msgid ""
msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr[0] ""
-"Το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
+msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
msgstr[1] ""
"Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
@@ -979,7 +980,8 @@ msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο πακέτο %s"
+"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο "
+"πακέτο %s"
#: cmdline/apt-get.cc:3015
#, c-format
@@ -1011,8 +1013,8 @@ msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει υποψήφια"
-"έκδοση"
+"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
+"υποψήφιαέκδοση"
#: cmdline/apt-get.cc:3106
#, c-format
@@ -1033,11 +1035,11 @@ msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισ
msgid "Changelog for %s (%s)"
msgstr "Changelog για %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1122,7 +1124,7 @@ msgstr ""
"για περισσότερες πληροφορίες και επιλογές.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1193,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, αλλά δε βρισκόταν εκεί"
@@ -1596,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"
@@ -2294,7 +2296,7 @@ msgstr "Αποτυχία εγγραφής του αρχείου %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2868,12 +2870,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 "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -3299,117 +3301,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"
@@ -3421,7 +3423,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/es.po b/po/es.po
index dda8114b6..4ee22810d 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1090,11 +1090,11 @@ msgstr "No se pudieron procesar las dependencias de construcción"
msgid "Changelog for %s (%s)"
msgstr "Conectando a %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1185,7 +1185,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1260,7 +1260,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í"
@@ -1660,8 +1660,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"
@@ -2361,11 +2361,11 @@ msgstr "Falló al truncar el archivo"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
-"valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)"
+"valor de «APT::Cache-Limit». El valor actual es: %lu (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2949,12 +2949,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"
@@ -3400,113 +3400,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 +3514,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 +3530,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 +3574,13 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa "
+#~ "el valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "No pude borrar %s"
diff --git a/po/eu.po b/po/eu.po
index e3d7623b8..4adaddd61 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1016,11 +1016,11 @@ msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
msgid "Changelog for %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1107,7 +1107,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1178,7 +1178,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"
@@ -1581,8 +1581,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"
@@ -2270,10 +2270,10 @@ msgstr "Huts fitxategia mozterakoan"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko "
+"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
"balioa: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
@@ -2841,12 +2841,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"
@@ -3266,117 +3266,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 +3388,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 +3423,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. "
+#~ "Uneko balioa: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Huts egin du %s kentzean"
diff --git a/po/fi.po b/po/fi.po
index 00f3ae327..1ef3e1f6f 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1012,11 +1012,11 @@ msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
msgid "Changelog for %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1102,7 +1102,7 @@ msgstr ""
"lisätietoja ja lisää valitsimia.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1173,7 +1173,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"
@@ -1573,8 +1573,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"
@@ -2268,7 +2268,7 @@ msgstr "Tiedoston typistäminen ei onnistunut"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2831,12 +2831,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ä"
@@ -3259,117 +3259,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 +3381,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/fr.po b/po/fr.po
index 90d5890f8..1c585aa82 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1056,11 +1056,11 @@ msgstr "Impossible d'activer les dépendances de construction"
msgid "Changelog for %s (%s)"
msgstr "Journal des modifications pour %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1150,7 +1150,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1227,7 +1227,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"
@@ -1658,8 +1658,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"
@@ -2359,11 +2359,11 @@ msgstr "Échec de la troncature du fichier"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
-"Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur "
+"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
@@ -2960,12 +2960,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"
@@ -3426,111 +3426,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 +3538,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 +3553,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 +3598,14 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de "
+#~ "place. Vous devriez augmenter la taille de APT::Cache-Start, dont la "
+#~ "valeur actuelle est de %lu (voir « man 5 apt.conf »)."
+
#~ msgid "Failed to remove %s"
#~ msgstr "Impossible de supprimer %s"
diff --git a/po/gl.po b/po/gl.po
index 1092efb3b..d027402c6 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1032,11 +1032,11 @@ msgstr "Non se puideron procesar as dependencias de construción"
msgid "Changelog for %s (%s)"
msgstr "Rexistro de cambios de %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1129,7 +1129,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1205,7 +1205,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í"
@@ -1609,8 +1609,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"
@@ -2305,11 +2305,11 @@ msgstr "Non foi posíbel truncar o ficheiro"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
-"Start. O valor actual é : %lu. (man 5 apt.conf)"
+"Limit. O valor actual é : %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2890,12 +2890,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"
@@ -3341,113 +3341,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 +3455,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 +3471,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 +3516,13 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
+#~ "Start. O valor actual é : %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Non foi posíbel retirar %s"
diff --git a/po/hu.po b/po/hu.po
index 171ecad7b..fa849bc4d 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1025,11 +1025,11 @@ msgstr "Nem sikerült az építési függőségeket feldolgozni"
msgid "Changelog for %s (%s)"
msgstr "Változási napló ehhez: %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1118,7 +1118,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1193,7 +1193,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"
@@ -1615,8 +1615,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ó"
@@ -2308,10 +2308,10 @@ msgstr "A fájl csonkítása meghiúsult"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A "
+"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
@@ -2897,12 +2897,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"
@@ -3340,110 +3340,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 +3451,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 +3467,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 +3510,13 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A "
+#~ "jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s eltávolítása sikertelen"
@@ -3635,10 +3650,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 d24f1aeb5..76981b7fc 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1043,11 +1043,11 @@ msgstr "Elaborazione delle dipendenze di generazione non riuscita"
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1137,7 +1137,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1213,7 +1213,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"
@@ -1638,8 +1638,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"
@@ -2336,10 +2336,10 @@ msgstr "Troncamento del file non riuscito"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il "
+"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
"valore attuale è: %lu (man 5 apt.conf)."
#: apt-pkg/contrib/mmap.cc:429
@@ -2936,12 +2936,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"
@@ -3395,113 +3395,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 +3509,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 +3525,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 +3570,13 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il "
+#~ "valore attuale è: %lu (man 5 apt.conf)."
+
#~ msgid "Failed to remove %s"
#~ msgstr "Rimozione di %s non riuscita"
@@ -3637,13 +3652,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 3531765ff..75efb4d07 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.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-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-07-01 00:14+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -108,7 +108,8 @@ msgstr "検索パターンはちょうど 1 つだけ指定してください"
#: cmdline/apt-cache.cc:1357
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
+msgstr ""
+"このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
#, c-format
@@ -154,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:3353 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
@@ -446,7 +447,9 @@ msgstr "'%s' のような仮想パッケージは削除できません\n"
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "パッケージ %s はインストールされていないため、削除はできません。'%s' のことでしょうか?\n"
+msgstr ""
+"パッケージ %s はインストールされていないため、削除はできません。'%s' のことで"
+"しょうか?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
@@ -647,7 +650,9 @@ msgstr "ダウンロードオンリーモードでパッケージのダウンロ
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
-msgstr "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-missing オプションを付けて試してみてください。"
+msgstr ""
+"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
+"missing オプションを付けて試してみてください。"
#: cmdline/apt-get.cc:1383
msgid "--fix-missing and media swapping is not currently supported"
@@ -819,7 +824,9 @@ msgstr "%s は自動でインストールしたと設定されました。\n"
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
-msgstr "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わりに使用してください。"
+msgstr ""
+"このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり"
+"に使用してください。"
#: cmdline/apt-get.cc:2183
msgid "Calculating upgrade... "
@@ -853,7 +860,8 @@ msgstr "%s %s をダウンロードしています"
#: cmdline/apt-get.cc:2451
msgid "Must specify at least one package to fetch source for"
-msgstr "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
+msgstr ""
+"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
#, c-format
@@ -877,7 +885,8 @@ msgid ""
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-"パッケージの最新の (まだリリースされていないかもしれない) 更新を取得するには、\n"
+"パッケージの最新の (まだリリースされていないかもしれない) 更新を取得するに"
+"は、\n"
"bzr branch %s\n"
"を使用してください。\n"
@@ -949,7 +958,9 @@ msgstr ""
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
-msgstr "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf(5) の APT::Architectures を参照してください。"
+msgstr ""
+"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf"
+"(5) の APT::Architectures を参照してください。"
#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
#, c-format
@@ -966,7 +977,9 @@ msgstr "%s にはビルド依存情報が指定されていません。\n"
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
-msgstr "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s の依存関係を満たすことができません"
+msgstr ""
+"パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s "
+"の依存関係を満たすことができません"
#: cmdline/apt-get.cc:3015
#, c-format
@@ -989,14 +1002,18 @@ msgstr ""
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
-msgstr "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないため、%2$s に対する %1$s の依存関係を満たすことができません"
+msgstr ""
+"パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた"
+"め、%2$s に対する %1$s の依存関係を満たすことができません"
#: cmdline/apt-get.cc:3083
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
-msgstr "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関係を満たすことができません"
+msgstr ""
+"パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
+"係を満たすことができません"
#: cmdline/apt-get.cc:3106
#, c-format
@@ -1017,11 +1034,11 @@ msgstr "ビルド依存関係の処理に失敗しました"
msgid "Changelog for %s (%s)"
msgstr "%s (%s) の変更履歴"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1067,7 +1084,8 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
"使用法: apt-get [オプション] コマンド\n"
-" apt-get [オプション] install|remove パッケージ名1 [パッケージ名2 ...]\n"
+" apt-get [オプション] install|remove パッケージ名1 [パッケージ名"
+"2 ...]\n"
" apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n"
"\n"
"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n"
@@ -1077,13 +1095,16 @@ msgstr ""
"コマンド:\n"
" update - 新しいパッケージリストを取得する\n"
" upgrade - アップグレードを行う\n"
-" install - 新規パッケージをインストールする (pkg は libc6.deb ではなく libc6 のように指定する)\n"
+" install - 新規パッケージをインストールする (pkg は libc6.deb ではなく "
+"libc6 のように指定する)\n"
" remove - パッケージを削除する\n"
-" autoremove - 自動インストールされ使われていないすべてのパッケージを削除する\n"
+" autoremove - 自動インストールされ使われていないすべてのパッケージを削除す"
+"る\n"
" purge - 設定ファイルまで含めてパッケージを削除する\n"
" source - ソースアーカイブをダウンロードする\n"
" build-dep - ソースパッケージの構築依存関係を設定する\n"
-" dist-upgrade - ディストリビューションをアップグレードする (apt-get(8) を参照)\n"
+" dist-upgrade - ディストリビューションをアップグレードする (apt-get(8) を参"
+"照)\n"
" dselect-upgrade - dselect の選択に従う\n"
" clean - ダウンロードしたアーカイブファイルを削除する\n"
" autoclean - ダウンロードした古いアーカイブファイルを削除する\n"
@@ -1109,7 +1130,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1184,7 +1205,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 を待ちましたが、そこにはありませんでした"
@@ -1241,7 +1262,8 @@ msgstr ""
" -f 指定のファイルを使って自動/手動のマーキングを読み書きする\n"
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 任意の設定オプションを指定する (例 -o dir::cache=/tmp)\n"
-"さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参照してください。"
+"さらなる情報については、マニュアルページ apt-mark(8) および apt.conf(5) を参"
+"照してください。"
#: methods/cdrom.cc:203
#, c-format
@@ -1599,8 +1621,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 を読み込むことができません"
@@ -2289,10 +2311,10 @@ msgstr "ファイルの切り詰めに失敗しました"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現"
+"動的 MMap が範囲を越えました。APT::Cache-Limit の大きさを増やしてください。現"
"在値は %lu です (man 5 apt.conf を参照)。"
#: apt-pkg/contrib/mmap.cc:429
@@ -2497,13 +2519,16 @@ msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではない
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します"
+msgstr ""
+"ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視します"
+msgstr ""
+"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
+"します"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2817,7 +2842,9 @@ msgstr "問題を解決することができません。壊れた変更禁止パ
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
-msgstr "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視されるか、古いものが代わりに使われます。"
+msgstr ""
+"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
+"るか、古いものが代わりに使われます。"
#: apt-pkg/acquire.cc:81
#, c-format
@@ -2859,14 +2886,16 @@ msgstr "メソッド %s が正常に開始しませんでした"
#: apt-pkg/acquire-worker.cc:440
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "'%s' とラベルの付いたディスクをドライブ '%s' に入れて 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 "適切なパッケージシステムタイプを特定できません"
@@ -2900,7 +2929,9 @@ msgstr "ソースのリストを読むことができません。"
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
-msgstr "APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用できないため、無効です"
+msgstr ""
+"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき"
+"ないため、無効です"
#: apt-pkg/policy.cc:396
#, c-format
@@ -2994,7 +3025,9 @@ msgstr "ハッシュサムが適合しません"
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
-msgstr "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った sources.list エントリか、壊れたファイル)"
+msgstr ""
+"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
+"sources.list エントリか、壊れたファイル)"
#: apt-pkg/acquire-item.cc:1386
#, c-format
@@ -3010,7 +3043,9 @@ msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
-msgstr "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新物は適用されません。"
+msgstr ""
+"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
+"物は適用されません。"
#: apt-pkg/acquire-item.cc:1488
#, c-format
@@ -3304,111 +3339,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."
@@ -3416,7 +3451,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"
@@ -3432,7 +3467,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 ""
@@ -3467,3 +3511,10 @@ msgstr ""
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr "ロックされていません"
+
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてくださ"
+#~ "い。現在値は %lu です (man 5 apt.conf を参照)。"
diff --git a/po/km.po b/po/km.po
index e9bcf9d3a..24f2a2c08 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -998,11 +998,11 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណ
msgid "Changelog for %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1087,7 +1087,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1158,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 ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1553,8 +1553,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 បានឡើយ"
@@ -2242,7 +2242,7 @@ msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯក
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2805,12 +2805,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 "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
@@ -3227,115 +3227,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 +3347,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/ko.po b/po/ko.po
index 9cd4135df..86ca7a4e6 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1008,11 +1008,11 @@ msgstr "빌드 의존성을 처리하는데 실패했습니다"
msgid "Changelog for %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1100,7 +1100,7 @@ msgstr ""
"apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
" 이 APT는 Super Cow Powers로 무장했습니다.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1175,7 +1175,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 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1571,8 +1571,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을(를) 읽을 수 없습니다"
@@ -2262,10 +2262,10 @@ msgstr "파일을 자르는데 실패했습니다"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 "
+"동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현재 "
"값: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
@@ -2833,12 +2833,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 "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
@@ -3260,110 +3260,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 +3371,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 +3384,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 +3425,13 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현"
+#~ "재 값: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "%s을(를) 지우는데 실패했습니다"
diff --git a/po/ku.po b/po/ku.po
index de54b3d0d..ea45e87f1 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -943,11 +943,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -993,7 +993,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1061,7 +1061,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 ""
@@ -1456,8 +1456,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"
@@ -2086,7 +2086,7 @@ msgstr "Nivîsîna pelê %s biserneket"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2640,12 +2640,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 ""
@@ -3054,115 +3054,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 +3174,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/lt.po b/po/lt.po
index c63c8f374..d52d55222 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -967,11 +967,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1017,7 +1017,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1088,7 +1088,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 ""
@@ -1479,8 +1479,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"
@@ -2180,7 +2180,7 @@ msgstr "Nepavyko patikrinti %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2737,12 +2737,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 ""
@@ -3153,115 +3153,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 +3273,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/mr.po b/po/mr.po
index 7c6a58d2b..7e9924103 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-08-20 12:04+0100\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 "
@@ -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:3353 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
@@ -998,11 +998,11 @@ msgstr "बांधणी-डिपेंडन्सीज क्रिया
msgid "Changelog for %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1089,7 +1089,7 @@ msgstr ""
" apt.conf(5) पुस्तिका पाने पहा.\n"
" ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1160,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 साठी थांबलो पण ते तेथे नव्हते"
@@ -1557,8 +1557,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 वाचण्यास असमर्थ"
@@ -2247,7 +2247,7 @@ msgstr "फाईल छोटी करणे असफल"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2811,12 +2811,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 "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
@@ -3240,115 +3240,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 +3360,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/nb.po b/po/nb.po
index 3b9875ff2..4710f9d78 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1018,11 +1018,11 @@ msgstr "Klarte ikke å behandle forutsetningene for bygging"
msgid "Changelog for %s (%s)"
msgstr "Kobler til %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1111,7 +1111,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1186,7 +1186,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"
@@ -1586,8 +1586,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"
@@ -2281,10 +2281,10 @@ msgstr "Klarte ikke forkorte fila %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. "
+"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
@@ -2853,12 +2853,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"
@@ -3289,109 +3289,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 +3399,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 +3415,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 +3455,13 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. "
+#~ "Nåværende verdi: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Klarte ikke å fjerne %s"
diff --git a/po/ne.po b/po/ne.po
index 084acb48a..9a614107f 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -998,11 +998,11 @@ msgstr "निर्माण निर्भरताहरू प्रक्
msgid "Changelog for %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1087,7 +1087,7 @@ msgstr ""
"pages हेर्नुहोस् ।\n"
" APT संग सुपर काउ शक्तिहरू छ ।\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1158,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 को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1554,8 +1554,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 पढ्न असफल भयो"
@@ -2244,7 +2244,7 @@ msgstr "फाइल %s लेख्न असफल भयो"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2808,12 +2808,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 "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
@@ -3231,115 +3231,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 +3351,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/nl.po b/po/nl.po
index c6cf6dcee..fa9ceba60 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1035,11 +1035,11 @@ msgstr "Verwerken van de bouwvereisten is mislukt"
msgid "Changelog for %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1128,7 +1128,7 @@ msgstr ""
"voor meer informatie en opties.\n"
" Deze APT heeft Super Koe kracht.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1203,7 +1203,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"
@@ -1608,8 +1608,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"
@@ -2308,11 +2308,11 @@ msgstr "Afkorten van bestand is mislukt"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
-"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
+"Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2893,12 +2893,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"
@@ -3344,113 +3344,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 +3458,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 +3474,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 +3517,13 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::"
+#~ "Cache-Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Verwijderen van %s is mislukt"
diff --git a/po/nn.po b/po/nn.po
index bdc50d036..b173bef3c 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1012,11 +1012,11 @@ msgstr "Klarte ikkje behandla byggjekrava"
msgid "Changelog for %s (%s)"
msgstr "Koplar til %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1102,7 +1102,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1173,7 +1173,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"
@@ -1571,8 +1571,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"
@@ -2257,7 +2257,7 @@ msgstr "Klarte ikkje skriva fila %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2826,12 +2826,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"
@@ -3250,115 +3250,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 +3370,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/pl.po b/po/pl.po
index 3c4c0c74d..3e0bc4965 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-07-28 21:53+0200\n"
+"POT-Creation-Date: 2012-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\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:510
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
#, 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:375
+#: cmdline/apt-get.cc:3353 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
@@ -1050,11 +1050,11 @@ msgstr "Nie udało się przetworzyć zależności dla budowania"
msgid "Changelog for %s (%s)"
msgstr "Dziennik zmian %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1142,7 +1142,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1219,29 +1219,29 @@ msgstr "%s został już zatrzymany.\n"
msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
+#: 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"
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297
#, c-format
msgid "%s set on hold.\n"
msgstr "%s został zatrzymany.\n"
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Odznaczono zatrzymanie %s\n"
# Musi pasować do su i sudo.
-#: cmdline/apt-mark.cc:332
+#: cmdline/apt-mark.cc:320
msgid "Executing dpkg failed. Are you root?"
msgstr ""
"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
-#: cmdline/apt-mark.cc:379
+#: cmdline/apt-mark.cc:367
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -1645,8 +1645,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"
@@ -1654,7 +1654,7 @@ msgstr "Nie można czytać %s"
#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: apt-pkg/clean.cc:122
#, c-format
msgid "Unable to change to %s"
msgstr "Nie udało się przejść do %s"
@@ -2311,43 +2311,43 @@ msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
msgid "Can't mmap an empty file"
msgstr "Nie można wykonać mmap na pustym pliku"
-#: apt-pkg/contrib/mmap.cc:111
+#: apt-pkg/contrib/mmap.cc:110
#, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr "Nie udało się zduplikować deskryptora pliku %i"
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-pkg/contrib/mmap.cc:118
#, c-format
msgid "Couldn't make mmap of %llu bytes"
msgstr "Nie udało się wykonać mmap %llu bajtów"
-#: apt-pkg/contrib/mmap.cc:146
+#: apt-pkg/contrib/mmap.cc:145
msgid "Unable to close mmap"
msgstr "Nie udało się zamknąć mmap"
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:173 apt-pkg/contrib/mmap.cc:201
msgid "Unable to synchronize mmap"
msgstr "Nie udało się zsynchronizować mmap"
-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc:279
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udało się wykonać mmap %lu bajtów"
-#: apt-pkg/contrib/mmap.cc:322
+#: apt-pkg/contrib/mmap.cc:311
msgid "Failed to truncate file"
msgstr "Nie udało się uciąć zawartości pliku %s"
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
-"Start. Bieżąca wartość: %lu. (man 5 apt.conf)"
+"Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:429
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2356,7 +2356,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:443
+#: apt-pkg/contrib/mmap.cc:432
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2923,12 +2923,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"
@@ -3290,35 +3290,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:403
+#: apt-pkg/cacheset.cc:401
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
-#: apt-pkg/cacheset.cc:406
+#: apt-pkg/cacheset.cc:404
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-#: apt-pkg/cacheset.cc:517
+#: apt-pkg/cacheset.cc:515
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nie udało się odnaleźć zadania \"%s\""
-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/cacheset.cc:521
#, 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:534
+#: apt-pkg/cacheset.cc:532
#, 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:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3327,21 +3327,21 @@ msgstr ""
"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
"ponieważ nie ma żadnej z nich"
-#: apt-pkg/cacheset.cc:555
+#: apt-pkg/cacheset.cc:553
#, 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:563
+#: apt-pkg/cacheset.cc:561
#, 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:571
+#: apt-pkg/cacheset.cc:569
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3370,111 +3370,111 @@ msgstr ""
msgid "Execute external solver"
msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-#: 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 "Operacja została przerwana, zanim mogła zostać zakończona"
-#: 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."
@@ -3482,7 +3482,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"
@@ -3498,7 +3498,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 ""
@@ -3535,6 +3544,13 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
+#~ "Start. Bieżąca wartość: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Nie udało się usunąć %s"
diff --git a/po/pt.po b/po/pt.po
index 4a2c1b57c..38b9318ec 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-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -107,7 +107,9 @@ msgstr "Tem de fornecer pelo menos um padrão de busca"
#: cmdline/apt-cache.cc:1357
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark showauto'."
+msgstr ""
+"Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
+"showauto'."
#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
#, c-format
@@ -154,7 +156,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:3353 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
@@ -448,7 +450,9 @@ msgstr "Pacotes virtuais como '%s' não podem ser removidos\n"
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "O pacote '%s' não está instalado, por isso não será removido. Queria dizer '%s'?\n"
+msgstr ""
+"O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
+"'%s'?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
@@ -949,8 +953,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-"Nenhuma informação de arquitectura disponível para %s. "
-"Para configuração veja apt.conf(5) APT::Architectures"
+"Nenhuma informação de arquitectura disponível para %s. Para configuração "
+"veja apt.conf(5) APT::Architectures"
#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
#, c-format
@@ -989,7 +993,7 @@ msgstr ""
"demasiado novo"
#: cmdline/apt-get.cc:3077
-#, , c-format
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
@@ -1025,11 +1029,11 @@ msgstr "Falhou processar as dependências de compilação"
msgid "Changelog for %s (%s)"
msgstr "Changlog para %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1090,8 +1094,8 @@ msgstr ""
" autoremove - Remover automaticamente todos os pacotes não utilizados\n"
" purge - Remover pacotes e ficheiros de configuração\n"
" source - Fazer o download de arquivos de código-fonte\n"
-" build-dep - Configurar as dependências de compilação de pacotes de "
-"código-fonte\n"
+" build-dep - Configurar as dependências de compilação de pacotes de código-"
+"fonte\n"
" dist-upgrade - Actualizar a distribuição, veja apt-get(8)\n"
" dselect-upgrade - Seguir as escolhas feitas no dselect\n"
" clean - Apagar ficheiros de arquivo obtidos por download\n"
@@ -1119,7 +1123,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1194,7 +1198,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\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á"
@@ -1237,20 +1241,22 @@ msgstr ""
"Utilização: apt-mark [opções] {auto|manual} pacote1 [pacote2...]\n"
"\n"
"apt-mark é um interface simples de linha de comandos para marcar pacotes "
-"como instalados de forma manual ou automática. Pode também listar marcações.\n"
+"como instalados de forma manual ou automática. Pode também listar "
+"marcações.\n"
"\n"
"Comandos:\n"
" auto - Marca os pacotes como instalados automaticamente\n"
" manual - Marca os pacotes como instalados manualmente\n"
"\n"
"Opções:\n"
-" -h Este texto de ajuda.\n"
-" -q Saída para registo - sem indicador de progresso\n"
+" -h\tEste texto de ajuda.\n"
+" -q\tSaída para registo - sem indicador de progresso\n"
" -qq Sem saída excepto para erros\n"
-" -s Não fazer. Apenas escreve o que seria feito.\n"
-" -f ler/escrever marcação auto/manual no ficheiro indicado\n"
+" -s\tNão fazer. Apenas escreve o que seria feito.\n"
+" -f\tler/escrever marcação auto/manual no ficheiro indicado\n"
" -c=? Ler este ficheiro de configuração\n"
-" -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/tmp\n"
+" -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
+"tmp\n"
"Para mais informações veja as páginas apt-mark(8) e apt.conf(5) do manual."
#: methods/cdrom.cc:203
@@ -1613,8 +1619,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"
@@ -2307,11 +2313,11 @@ msgstr "Falhou truncar o ficheiro"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
-"Start. Valor actual: %lu. (man 5 apt.conf)"
+"Limit. Valor actual: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2512,7 +2518,8 @@ msgstr "Não foi possível obter acesso exclusivo a %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Lista de ficheiros que não podem ser criados porque '%s' não é um directório"
+msgstr ""
+"Lista de ficheiros que não podem ser criados porque '%s' não é um directório"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
@@ -2522,15 +2529,17 @@ msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome do ficheiro"
+msgstr ""
+"A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome "
+"do ficheiro"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão inválida "
-"no nome do ficheiro"
+"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
+"inválida no nome do ficheiro"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2893,12 +2902,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"
@@ -3351,111 +3360,111 @@ msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
msgid "Execute external solver"
msgstr "Executar resolvedor externo"
-#: 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 "A operação foi interrompida antes de poder terminar"
-#: 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."
@@ -3463,7 +3472,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"
@@ -3479,7 +3488,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 ""
@@ -3516,6 +3534,13 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::"
+#~ "Cache-Start. Valor actual: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Falhou remover %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3f352079f..db93e61a8 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-08-20 12:04+0100\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."
@@ -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:3353 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
@@ -1025,11 +1025,11 @@ msgstr "Falhou ao processar as dependências de construção"
msgid "Changelog for %s (%s)"
msgstr "Conectando em %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1117,7 +1117,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1188,7 +1188,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á"
@@ -1590,8 +1590,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"
@@ -2289,7 +2289,7 @@ msgstr "Falhou ao truncar arquivo"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2864,12 +2864,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."
@@ -3299,115 +3299,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 +3419,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/ro.po b/po/ro.po
index 584eca389..6cd7d32af 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1026,11 +1026,11 @@ msgstr "Eșec la prelucrarea dependențelor de compilare"
msgid "Changelog for %s (%s)"
msgstr "Conectare la %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1119,7 +1119,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1190,7 +1190,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"
@@ -1595,8 +1595,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"
@@ -2299,7 +2299,7 @@ msgstr "Eșec la trunchierea fișierului"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2868,12 +2868,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"
@@ -3305,116 +3305,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 +3426,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/ru.po b/po/ru.po
index 153d22624..2f9efbe75 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-08-20 12:04+0100\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -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:3353 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
@@ -456,8 +456,8 @@ msgstr "Виртуальные пакеты, подобные «%s», не мо
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
-"Пакет «%s» не установлен, поэтому не может быть удалён. "
-"Возможно имелся в виду «%s»?\n"
+"Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в "
+"виду «%s»?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
@@ -1044,11 +1044,11 @@ msgstr "Обработка зависимостей для сборки заве
msgid "Changelog for %s (%s)"
msgstr "Changelog для %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1140,7 +1140,7 @@ msgstr ""
"содержится подробная информация и описание параметров.\n"
" В APT есть коровья СУПЕРСИЛА.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1215,7 +1215,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, но он не был запущен"
@@ -1640,8 +1640,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"
@@ -2338,10 +2338,10 @@ msgstr "Не удалось обрезать файл"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. "
+"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
"Текущее значение: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
@@ -2925,12 +2925,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 "Невозможно определить подходящий тип системы пакетирования"
@@ -2999,7 +2999,8 @@ msgstr "Произошла ошибка во время обработки %s (%
#: apt-pkg/pkgcachegen.cc:234
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Превышено допустимое количество имён пакетов, которое способен обработать APT."
+"Превышено допустимое количество имён пакетов, которое способен обработать "
+"APT."
#: apt-pkg/pkgcachegen.cc:237
msgid "Wow, you exceeded the number of versions this APT is capable of."
@@ -3014,7 +3015,8 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:243
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Превышено допустимое количество зависимостей, которое способен обработать APT."
+"Превышено допустимое количество зависимостей, которое способен обработать "
+"APT."
#: apt-pkg/pkgcachegen.cc:523
#, c-format
@@ -3372,111 +3374,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."
@@ -3484,7 +3486,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"
@@ -3500,7 +3502,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 ""
@@ -3537,6 +3548,13 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. "
+#~ "Текущее значение: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Не удалось удалить %s"
diff --git a/po/sk.po b/po/sk.po
index c913a1dbf..b3d91cfd5 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1030,11 +1030,11 @@ msgstr "Spracovanie závislostí na zostavenie zlyhalo"
msgid "Changelog for %s (%s)"
msgstr "Záznam zmien %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1122,7 +1122,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tento APT má schopnosti posvätnej kravy.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1197,7 +1197,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"
@@ -1613,8 +1613,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"
@@ -2300,11 +2300,11 @@ msgstr "Nepodarilo sa skrátiť súbor"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
-"Start. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
#, c-format
@@ -2872,12 +2872,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"
@@ -3313,111 +3313,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 +3425,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 +3441,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 +3480,13 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
+#~ "Start. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Odstránenie %s zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index 816fc7202..77b6b6b09 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1030,11 +1030,11 @@ msgstr "Obdelava odvisnosti za gradnjo je spodletela"
msgid "Changelog for %s (%s)"
msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1121,7 +1121,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1196,7 +1196,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"
@@ -1611,8 +1611,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"
@@ -2301,11 +2301,11 @@ msgstr "Ni mogoče obrezati datoteke"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-"
-"Start. Trenutna vrednost: %lu. (man 5 apt.conf)"
+"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
#, c-format
@@ -2877,12 +2877,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"
@@ -3317,112 +3317,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 +3430,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 +3446,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 +3486,13 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-"
+#~ "Start. Trenutna vrednost: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Odstranitev %s ni uspela"
@@ -3553,13 +3568,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 2919c9416..b64cf2158 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1026,11 +1026,11 @@ msgstr "Misslyckades med att behandla byggberoenden"
msgid "Changelog for %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1118,7 +1118,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1198,7 +1198,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"
@@ -1602,8 +1602,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"
@@ -2299,10 +2299,10 @@ msgstr "Misslyckades med att kapa av filen"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. "
+"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
@@ -2877,13 +2877,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"
@@ -3317,110 +3317,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 +3428,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 +3444,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 +3486,13 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. "
+#~ "Aktuellt värde: %lu. (man 5 apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Misslyckades med att ta bort %s"
diff --git a/po/th.po b/po/th.po
index 9ca45cba1..d41df26eb 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -994,11 +994,11 @@ msgstr "ติดตั้งสิ่งที่จำเป็นสำหร
msgid "Changelog for %s (%s)"
msgstr "เชื่อมต่อไปยัง %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1084,7 +1084,7 @@ msgstr ""
"และ apt.conf(5)\n"
" APT นี้มีพลังของ Super Cow\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1155,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 แต่ตัวโพรเซสไม่อยู่"
@@ -1548,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"
@@ -2230,7 +2230,7 @@ msgstr "ไม่สามารถตัดท้ายแฟ้ม"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2792,12 +2792,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 "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
@@ -3210,117 +3210,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 +3332,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/tl.po b/po/tl.po
index 7a551a643..f87de0201 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1020,11 +1020,11 @@ msgstr "Bigo sa pagproseso ng build dependencies"
msgid "Changelog for %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1109,7 +1109,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1180,7 +1180,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"
@@ -1581,8 +1581,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"
@@ -2279,7 +2279,7 @@ msgstr "Bigo sa pagsulat ng talaksang %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2855,12 +2855,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 "
@@ -3289,115 +3289,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 +3409,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/uk.po b/po/uk.po
index 87aeafa62..ded60ae7f 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1022,11 +1022,11 @@ msgstr "Обробка залежностей для побудови закін
msgid "Changelog for %s (%s)"
msgstr "З'єднання з %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1115,7 +1115,7 @@ msgstr ""
"містять більше інформації.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1184,7 +1184,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 але його тут немає"
@@ -1588,8 +1588,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"
@@ -2294,7 +2294,7 @@ msgstr "Не вдалося записати файл %s"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
@@ -2873,12 +2873,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 "Неможливо визначити тип необхідної системи пакування "
@@ -3299,116 +3299,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 +3420,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/vi.po b/po/vi.po
index 361a995fc..cd58dc77d 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -1016,11 +1016,11 @@ msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
msgid "Changelog for %s (%s)"
msgstr "Đang kết nối đến %s (%s)..."
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1116,7 +1116,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:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1191,7 +1191,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ó"
@@ -1592,8 +1592,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"
@@ -2308,11 +2308,11 @@ msgstr "Lỗi cắt ngắn tập tin"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
"Dynamic MMap (ảnh xạ bộ nhớ động) đã hết sức chứa.\n"
-"Hãy tăng kích cỡ của « APT::Cache-Start » (giới hạn vùng nhớ tạm Apt).\n"
+"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
@@ -2890,12 +2890,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"
@@ -3331,110 +3331,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 +3442,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 +3455,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 +3494,14 @@ msgstr ""
msgid "Not locked"
msgstr "Không phải bị khoá"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "Dynamic MMap (ảnh xạ bộ nhớ động) đã hết sức chứa.\n"
+#~ "Hãy tăng kích cỡ của « APT::Cache-Start » (giới hạn vùng nhớ tạm Apt).\n"
+#~ "Giá trị hiện thời: %lu. (man 5 apt.conf)"
+
#~ 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 7e2865552..2a08e8256 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-08-20 12:04+0100\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"
@@ -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:3353 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
@@ -992,11 +992,11 @@ msgstr "无法处理构建依赖关系"
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1084,7 +1084,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1158,7 +1158,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 的退出,但是它并不存在"
@@ -1552,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"
@@ -2233,10 +2233,10 @@ msgstr "无法截断文件"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 "
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 "
"apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
@@ -2801,12 +2801,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 "无法确定适合的打包系统类型"
@@ -3225,115 +3225,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 +3345,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 +3381,13 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 "
+#~ "apt.conf)"
+
#~ msgid "Failed to remove %s"
#~ msgstr "无法卸载 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b6abc8cad..20d3a0f57 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-08-20 12:04+0100\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."
@@ -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:3353 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
@@ -993,11 +993,11 @@ msgstr "無法處理編譯相依關係"
msgid "Changelog for %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3358
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3399
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1083,7 +1083,7 @@ msgstr ""
"以取得更多資訊和選項。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3564
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1154,7 +1154,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 但是它並不存在"
@@ -1548,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"
@@ -2231,10 +2231,10 @@ msgstr "無法截短檔案"
#: apt-pkg/contrib/mmap.cc:330
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為:%lu。"
+"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為:%lu。"
"(man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:429
@@ -2793,12 +2793,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 "無法確認合適的套件包裝系統類型"
@@ -3211,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
#, 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 +3331,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 +3366,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Start. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為:"
+#~ "%lu。(man 5 apt.conf)"
+
#~ 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