summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/deb/dpkgpm.cc26
-rw-r--r--apt-pkg/depcache.cc4
-rw-r--r--apt-pkg/init.cc3
-rw-r--r--apt-pkg/init.h2
-rw-r--r--cmdline/apt-get.cc5
-rwxr-xr-xcmdline/apt-key16
-rw-r--r--cmdline/makefile2
-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/apt.postinst5
-rw-r--r--debian/changelog1976
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/examples/sources.list12
-rw-r--r--doc/po/apt-doc.pot5
-rw-r--r--doc/po/fr.po116
-rw-r--r--po/apt-all.pot364
-rw-r--r--po/makefile6
-rw-r--r--po/sl.po1065
-rw-r--r--share/apt-auth-failure.note11
-rw-r--r--share/ubuntu-archive.gpgbin0 -> 1724 bytes
23 files changed, 2954 insertions, 693 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index eb9abe909..240574d2a 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1285,7 +1285,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;
@@ -1312,16 +1312,28 @@ 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, "Cannot 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;
- 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
+ const char *short_read_error = dgettext("dpkg", "short read in buffer_copy %s");
+ vector<string> list = VectorizeString(short_read_error, '%');
+ 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
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index fba6ad054..a30bea3cc 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -939,9 +939,13 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge,
std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
return false;
}
+ // if the removal is not explictely requested by the user, protect
+ // explicit new-install package from accidental removal by the
+ // problemresolver
else if (FromUser == false && Pkg->CurrentVer == 0)
{
StateCache &P = PkgState[Pkg->ID];
+ // Status == 2 means this applies for new installs only
if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
{
if (DebugMarker == true)
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a30f27844..0354e6e4d 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -84,6 +84,9 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+ // ubuntu specific
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
// Translation
Cnf.Set("APT::Acquire::Translation", "environment");
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 15a1165b9..6d3ef953c 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -21,7 +21,7 @@
// reverse-dependencies of libapt-pkg against the new SONAME.
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
-#define APT_PKG_MAJOR 4
+#define APT_PKG_MAJOR 4
#define APT_PKG_MINOR 10
#define APT_PKG_RELEASE 1
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6a30c5a50..f71b252c8 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2970,7 +2970,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 3838fafcd..288fb52fb 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -13,13 +13,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
+
add_keys_with_verify_against_master_keyring() {
ADD_KEYRING=$1
@@ -76,7 +76,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
@@ -90,7 +90,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
diff --git a/cmdline/makefile b/cmdline/makefile
index 917ccc96a..12418bd28 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -64,3 +64,5 @@ include $(COPY_H)
#TO=$(BIN)
#TARGET=program
#include $(COPY_H)
+
+
diff --git a/configure.in b/configure.in
index b2880c99c..c44bad048 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)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.9ubuntu1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.conf.changelog b/debian/apt.conf.changelog
new file mode 100644
index 000000000..7605c97d9
--- /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 c61bfb9bb..8c69a389a 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -428,6 +428,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
@@ -441,6 +448,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
+ fi
else
debug_echo "download updated metadata (error)"
fi
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 2770d79bb..31d811acc 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -12,4 +12,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/apt.postinst b/debian/apt.postinst
index cc0d8b1fe..2ebcfb19b 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,7 +15,10 @@ set -e
case "$1" in
configure)
- apt-key update
+ if ! test -f /etc/apt/trusted.gpg; then
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
+ fi
+ apt-key update || true
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index fc883dc0d..3d63fb64e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,24 @@
+apt (0.8.13ubuntu2) UNRELEASED; 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> Wed, 16 Mar 2011 20:39:21 +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 ]
- * debian/zzapt.cron.daily:
- - move cron job to the end of execution (LP: #727685)
* methods/rsh.cc
- fix rsh/ssh option parsing (LP: #678080), thanks to
Ville Mattila
@@ -11,14 +27,39 @@ apt (0.8.13) unstable; urgency=low
* apt-pkg/acquire-item.cc:
- mark pkgAcqIndexTrans as Index-File to avoid asking the
user to insert the CD on each apt-get update
+ * po/sl.po:
+ - updated, thanks to Andrej Znidarsic
* mirror method:
- when downloading data, show the mirror being used
- - randomize mirror list to ensure more even load
- - merge fix from Matt Zimmerman, many thanks (LP: #741098)
- - do not crash if the mirror file fails to download
+ - randomize mirror list after download in a host specific way
+ to ensure that the load is evenly spreaded accross the mirrors
+ - fix some missing "Fail-Ignore"
+
+ -- 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 ]
@@ -72,6 +113,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 ]
@@ -303,6 +361,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 ]
@@ -322,6 +401,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 ]
@@ -353,6 +474,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 ]
@@ -372,6 +534,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 ]
@@ -490,6 +663,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 ]
@@ -582,6 +841,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 ]
@@ -624,6 +946,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 ]
@@ -666,6 +1002,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 ]
@@ -1280,6 +1666,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 ]
@@ -1400,6 +1932,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 ]
@@ -1543,6 +2108,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 ]
@@ -1612,6 +2200,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 ]
@@ -1841,6 +2482,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 ]
@@ -1884,6 +2553,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 ]
@@ -1952,6 +2740,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 ]
@@ -2250,6 +3044,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 ]
@@ -2476,6 +3354,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 ]
@@ -2601,6 +3741,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
@@ -2628,6 +3955,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 ]
@@ -2688,6 +4023,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.
@@ -2810,6 +4229,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
@@ -2839,6 +4368,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.
@@ -2951,6 +4500,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:
@@ -2996,6 +4712,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
@@ -3084,6 +4831,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:
@@ -3116,6 +4883,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:
@@ -3139,6 +4938,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:
@@ -3162,6 +4979,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:
@@ -3182,6 +5012,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:
@@ -3288,6 +5134,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
@@ -3297,6 +5217,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
@@ -3312,6 +5238,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
@@ -3324,6 +5283,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 ba0901538..36573da4b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
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>
@@ -13,9 +14,10 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}, gnupg
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: manpages-pl (<< 20060617-3~)
Provides: ${libapt-pkg:provides}
+Recommends: ubuntu-keyring, gpg
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
Description: Advanced front-end for dpkg
diff --git a/debian/rules b/debian/rules
index 640900678..817daee95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,6 +173,8 @@ apt: build build-doc
# 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/examples/sources.list b/doc/examples/sources.list
index ef729e203..cc0fd2b8d 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,9 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu hardy main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu hardy main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://security.debian.org stable/updates main contrib non-free
+deb http://security.ubuntu.com/ubuntu hardy-security main restricted
+deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 159f86e6a..0720f4c1f 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -11,10 +11,9 @@ msgstr ""
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING"
#. type: TH
#: apt.8:17
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 33a118036..3c8f1a8ac 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-02-14 13:42+0100\n"
+"POT-Creation-Date: 2011-03-10 11:35+0100\n"
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1277,7 +1277,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1304,12 +1304,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1425,7 +1425,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1545,7 +1545,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -1563,7 +1563,7 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
#: sources.list.5.xml:234
@@ -1577,7 +1577,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -1712,7 +1712,7 @@ msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1969,7 +1969,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3120,28 +3120,49 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
+msgid ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:531
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible. Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible. "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
msgstr ""
-"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand "
-"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où "
-"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</"
-"literal>."
+"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
+"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
+"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs "
+"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:539
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:541
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3151,7 +3172,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:547
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3166,12 +3187,12 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:550
+#: apt-ftparchive.1.xml:553
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:552
+#: apt-ftparchive.1.xml:555
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3185,12 +3206,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:561
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:560
+#: apt-ftparchive.1.xml:563
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3206,12 +3227,12 @@ msgstr ""
"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:571
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:570
+#: apt-ftparchive.1.xml:573
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3222,12 +3243,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:577
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:576
+#: apt-ftparchive.1.xml:579
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3236,12 +3257,12 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:583
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:581
+#: apt-ftparchive.1.xml:584
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3255,12 +3276,12 @@ msgstr ""
"<literal>APT::FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:590
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:592
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3283,12 +3304,12 @@ msgstr ""
"survenir et l'ensemble de ces contrôles devient inutile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:599
+#: apt-ftparchive.1.xml:602
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:601
+#: apt-ftparchive.1.xml:604
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3304,19 +3325,19 @@ msgstr ""
"generate."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:496
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:622
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:615
+#: apt-ftparchive.1.xml:618
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3325,7 +3346,7 @@ msgstr ""
"des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:629
+#: apt-ftparchive.1.xml:632
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -10986,6 +11007,19 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+#~ msgid "<option>--md5</option>"
+#~ msgstr "<option>--md5</option>"
+
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible. Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. "
+#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs "
+#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
+#~ "FTPArchive::MD5</literal>."
+
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 4634bf64c..0479bf303 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-12 17:42+0100\n"
+"POT-Creation-Date: 2010-10-29 10:12-0400\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"
@@ -149,7 +149,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -616,70 +616,75 @@ msgstr ""
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:561
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:571
+#: cmdline/apt-get.cc:569
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:605
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:609
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:609
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:613
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:617
+#: cmdline/apt-get.cc:615
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:639
+#: cmdline/apt-get.cc:635
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:645
+#: cmdline/apt-get.cc:641
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:648
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:658
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:669
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:678
msgid " [Not candidate version]"
msgstr ""
-#: cmdline/apt-get.cc:684
+#: cmdline/apt-get.cc:680
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:683
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -687,177 +692,167 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:705
+#: cmdline/apt-get.cc:701
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:713
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:728
+#: cmdline/apt-get.cc:724
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
-#: cmdline/apt-get.cc:759
+#: cmdline/apt-get.cc:755
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:789
+#: cmdline/apt-get.cc:785
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:789
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: cmdline/apt-get.cc:803
+#: cmdline/apt-get.cc:799
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:808
+#: cmdline/apt-get.cc:804
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:853
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:858
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:973
+#: cmdline/apt-get.cc:938
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:941
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:944
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:947
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:949
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:953
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:956
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:981
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:985
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:992
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:1029
+#: cmdline/apt-get.cc:994
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1044
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1088
+#: cmdline/apt-get.cc:1053
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1064
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:1137
+#: cmdline/apt-get.cc:1104
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1149
+#: cmdline/apt-get.cc:1116
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1123
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1161
+#: cmdline/apt-get.cc:1128
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1174
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:1209
+#: cmdline/apt-get.cc:1176
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -865,46 +860,46 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
+#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1197
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
+#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1287
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
+#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1294
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1298
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1303
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1304
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1365
+#: cmdline/apt-get.cc:1332
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -914,35 +909,56 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1336
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1499
+#: cmdline/apt-get.cc:1466
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1498
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1536
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1552
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1647
+#: cmdline/apt-get.cc:1618
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1699
+#: cmdline/apt-get.cc:1666
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: cmdline/apt-get.cc:1670
+#, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: cmdline/apt-get.cc:1672
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1677
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -958,50 +974,29 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1684
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1713
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1717
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1719
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1703
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1828
+#: cmdline/apt-get.cc:1792
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1831
+#: cmdline/apt-get.cc:1795
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1843
+#: cmdline/apt-get.cc:1807
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1009,69 +1004,69 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:1825
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1854
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1944
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1980
+#: cmdline/apt-get.cc:1945
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1987
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:2029
+#: cmdline/apt-get.cc:1994
#, c-format
msgid "%s set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2050
+#: cmdline/apt-get.cc:2015
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2023
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
+#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2198
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2289
+#: cmdline/apt-get.cc:2254
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2259
#, c-format
msgid ""
"Please use:\n"
@@ -1079,115 +1074,115 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2310
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2380
+#: cmdline/apt-get.cc:2345
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2353
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2399
+#: cmdline/apt-get.cc:2364
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2432
+#: cmdline/apt-get.cc:2397
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2462
+#: cmdline/apt-get.cc:2427
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2474
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2475
+#: cmdline/apt-get.cc:2440
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2492
+#: cmdline/apt-get.cc:2457
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2512
+#: cmdline/apt-get.cc:2477
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2493
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2559
+#: cmdline/apt-get.cc:2524
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2579
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2595
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2683
+#: cmdline/apt-get.cc:2648
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2719
+#: cmdline/apt-get.cc:2684
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2746
+#: cmdline/apt-get.cc:2711
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2762
+#: cmdline/apt-get.cc:2727
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2767
+#: cmdline/apt-get.cc:2732
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2798
+#: cmdline/apt-get.cc:2763
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2839
+#: cmdline/apt-get.cc:2804
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1233,7 +1228,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:2960
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1241,33 +1236,33 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:55
msgid "Hit "
msgstr ""
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:79
msgid "Get:"
msgstr ""
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:110
msgid "Ign "
msgstr ""
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:114
msgid "Err "
msgstr ""
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
msgstr ""
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:271
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1464,9 +1459,9 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
+#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
@@ -1703,7 +1698,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
msgid "Read error"
msgstr ""
@@ -1715,7 +1710,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
msgid "Write error"
msgstr ""
@@ -2180,77 +2175,72 @@ msgstr ""
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:321
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:661
+#: apt-pkg/contrib/fileutl.cc:643
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:673
+#: apt-pkg/contrib/fileutl.cc:655
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:657
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:661
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:663
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:746
+#: apt-pkg/contrib/fileutl.cc:728
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:763
+#: apt-pkg/contrib/fileutl.cc:745
#, c-format
msgid "Could not open file descriptor %d"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:823
+#: apt-pkg/contrib/fileutl.cc:805
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:856
+#: apt-pkg/contrib/fileutl.cc:838
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:985
+#: apt-pkg/contrib/fileutl.cc:967
#, c-format
msgid "Problem closing the gzip file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:988
+#: apt-pkg/contrib/fileutl.cc:970
#, c-format
msgid "Problem closing the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:993
+#: apt-pkg/contrib/fileutl.cc:975
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1004
+#: apt-pkg/contrib/fileutl.cc:986
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1017
+#: apt-pkg/contrib/fileutl.cc:999
msgid "Problem syncing the file"
msgstr ""
@@ -2331,33 +2321,33 @@ msgstr ""
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:125
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:154
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:236
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:922
+#: apt-pkg/depcache.cc:921
#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
msgstr ""
@@ -2475,17 +2465,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1218
+#: apt-pkg/algorithms.cc:1210
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1220
+#: apt-pkg/algorithms.cc:1212
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
+#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -2533,12 +2523,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:143
+#: apt-pkg/init.cc:146
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:159
+#: apt-pkg/init.cc:162
msgid "Unable to determine a suitable packaging system type"
msgstr ""
diff --git a/po/makefile b/po/makefile
index 9f8b7b22e..d2fb8d280 100644
--- a/po/makefile
+++ b/po/makefile
@@ -55,7 +55,11 @@ $(PACKAGE)-all.pot: $(POTFILES)
$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
printf "%s " "Generating $@"
echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
- $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
+ # thanks powerpc for segfaulting in msgmerge in the first run
+ # (but not the second) - the part "||.." should get removed
+ # once powerpc is a bit more stable
+ $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ || \
+ $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
$(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
diff --git a/po/sl.po b/po/sl.po
index 1d722b60f..33e8e009b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,26 +4,26 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-15 06:09+0100\n"
-"PO-Revision-Date: 2010-09-05 20:35+0100\n"
-"Last-Translator: Andrej Znidarąič <andrej.znidarsic@gmail.com>\n"
+"POT-Creation-Date: 2011-03-04 17:08+0000\n"
+"PO-Revision-Date: 2011-03-06 15:47+0000\n"
+"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
-"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-09-04 12:16+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Language: Slovenian\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2011-03-07 13:08+0000\n"
+"X-Generator: Launchpad (build 12515)\n"
"X-Poedit-Country: SLOVENIA\n"
+"Language: sl\n"
+"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
#: cmdline/apt-cache.cc:156
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Paket %s različica %s ima nereąene odvisnosti:\n"
+msgstr "Paket %s različica %s ima nerešene odvisnosti:\n"
#: cmdline/apt-cache.cc:284
msgid "Total package names: "
@@ -31,7 +31,7 @@ msgstr "Vseh imen paketov: "
#: cmdline/apt-cache.cc:286
msgid "Total package structures: "
-msgstr "Skupno struktur paketov"
+msgstr "Skupno struktur paketov : "
#: cmdline/apt-cache.cc:326
msgid " Normal packages: "
@@ -47,7 +47,7 @@ msgstr " Posamezni navidezni paketi: "
#: cmdline/apt-cache.cc:329
msgid " Mixed virtual packages: "
-msgstr " Meąani navidezni paketi: "
+msgstr " Mešani navidezni paketi: "
#: cmdline/apt-cache.cc:330
msgid " Missing: "
@@ -59,7 +59,7 @@ msgstr "Vseh različic: "
#: cmdline/apt-cache.cc:334
msgid "Total distinct descriptions: "
-msgstr "Skupno različnih opisov:"
+msgstr "Skupno različnih opisov: "
#: cmdline/apt-cache.cc:336
msgid "Total dependencies: "
@@ -71,7 +71,7 @@ msgstr "Vseh povezav Raz/Dat: "
#: cmdline/apt-cache.cc:341
msgid "Total Desc/File relations: "
-msgstr "Skupno razmerij opisov/datotek:"
+msgstr "Skupno razmerij opisov/datotek: "
#: cmdline/apt-cache.cc:343
msgid "Total Provides mappings: "
@@ -79,7 +79,7 @@ msgstr "Vseh dobljenih preslikav: "
#: cmdline/apt-cache.cc:355
msgid "Total globbed strings: "
-msgstr "Vseh raząirjenih nizov: "
+msgstr "Vseh razširjenih nizov: "
#: cmdline/apt-cache.cc:369
msgid "Total dependency version space: "
@@ -101,7 +101,7 @@ msgstr "Datoteka paketa %s ni usklajena."
#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
msgid "No packages found"
-msgstr "Nobena paket ni bil najden"
+msgstr "Noben paket ni bil najden"
#: cmdline/apt-cache.cc:1221
msgid "You must give at least one search pattern"
@@ -131,7 +131,7 @@ msgstr "(ni najdeno)"
#: cmdline/apt-cache.cc:1523
msgid " Installed: "
-msgstr " Nameąčen: "
+msgstr " Nameščen: "
#: cmdline/apt-cache.cc:1524
msgid " Candidate: "
@@ -143,7 +143,7 @@ msgstr "(brez)"
#: cmdline/apt-cache.cc:1563
msgid " Package pin: "
-msgstr " Bucika paketa:"
+msgstr " Bucika paketa: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1572
@@ -152,13 +152,12 @@ msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3047 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:3093 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s za %s preveden na %s %s\n"
+msgstr "%s %s za %s kodno preveden na %s %s\n"
#: cmdline/apt-cache.cc:1693
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -195,42 +194,41 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Uporaba: apt-cache [moľnosti] ukaz\n"
-" apt-cache [moľnosti] add datoteka1 [datoteka2 ...]\n"
-" apt-cache [moľnosti] showpkg paket1 [paket2 ...]\n"
-" apt-cache [moľnosti] showsrc paket 1 [paket2 ...]\n"
+"Uporaba: apt-cache [možnosti] ukaz\n"
+" apt-cache [options] showpkg pak1 [pak2 ...]\n"
+" apt-cache [options] showsrc pak1 [pak2 ...]\n"
"\n"
-"apt-cache je orodje nizke ravni, ki se uporablja za upravljanje APT-ovih\n"
-"binarnih datotek predpomnilnika in za poizvedbo podatkov iz njih\n"
+"apt-cache je orodje nizke ravni za poizvedbo podatkov\n"
+"iz APT-ovih binarnih datotek predpomnilnika\n"
"\n"
-"Ukazi: add - dodat datoteko paketa v predpomnilnik vira\n"
-" gencaches - izgradi tako paket kot izvorni predpomnilnik\n"
-" showpkg - pokaľe nekaj sploąnih podatkov za posamezen paket\n"
-" showsrc - pokaľe zapise vira\n"
-" stats - pokaľe nekaj osnovne statistike\n"
-" dump - pokaľe celotno datoteko v obliki terse\n"
-" dumpavail - izpiąe razpoloľljivo datoteko na standardni izhod\n"
-" unmet - pokaľe nerazreąene odvisnosti\n"
-" search - iąče seznam paketov za vzorec logičnega izraza\n"
-" show - iąče berljiv zapis paketa\n"
-" showauto - pokaľe seznam samodejno nameąčenih paketov\n"
-" depends - pokaľe surove podatke odvisnosti za paket\n"
-" rdepends - pokaľe obratne podatke odvisnosti za paket\n"
-" pkgnames - naąteje imena vseh paketov na sistemu\n"
+"Ukazi:\n"
+" gencaches - izgradi tako predpomnilnik paketa kot izvorne kode\n"
+" showpkg - pokaže nekaj podrobnosti za posamezen paket\n"
+" showsrc - pokaže zapise izvorne kode\n"
+" stats - pokaže nekaj osnovne statistike\n"
+" dump - pokaže celotno datoteko v obliki terse\n"
+" dumpavail - izpiše razpoložljivo datoteko na stdout\n"
+" unmet - pokaže nezadoščene odvisnosti\n"
+" search - išče po seznamu paketov za vzorec logičnega izraza\n"
+" show - pokaže berljiv zapis za paket\n"
+" showauto - pokaže seznam samodejno nameščenih pakrov\n"
+" depends - pokaže surove podrobnosti odvisnosti za paket\n"
+" rdepends - pokaže obratne podrobnosti odvisnosti za paket\n"
+" pkgnames - izpiše imena vseh paketov na sistemu\n"
" dotty - ustvari grafe paketov za GraphViz\n"
" xvcg - ustvari grafe paketov za xvcg\n"
-" policy - pokaľe nastavitve pravil\n"
+" policy - pokaži nastavitve pravil\n"
"\n"
-"Moľnosti:\n"
-" -h to besedilo pomoči\n"
-" -p=? predpomnilnik paketa\n"
-" -s=? predpomnilnik vira\n"
-" -q onemogoči pokazatelj napredka\n"
-" -i pokaľe le pomembne odvisnosti za ukaz unmet.\n"
-" -c=? prebere podano datoteko nastavitev\n"
-" -o=? nastavi poljubno moľnost nastavitev, na primer -o dir::cache=/tmp\n"
-"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt-conf"
-"(5).\n"
+"Možnosti:\n"
+" -h to besedilo pomoči.\n"
+" -p=? predpomnilnik paketa.\n"
+" -s=? predpomnilnik izvorne kode.\n"
+" -q onemogoči kazalnik napredka.\n"
+" -i pokaže le pomembne odvisnosti za nezadoščen ukaz.\n"
+" -c=? prebere to nastavitveno datoteko\n"
+" -o=? nastavi poljubno nastavitveno možnost, npr -o dir::cahce=/tmp\n"
+"Oglejte si strani priročnika apt-cache(8) in apt.conf(5) za več "
+"podrobnosti.\n"
#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -247,7 +245,7 @@ msgstr "Priklapljanje '%s' na '%s' je spodletelo"
#: cmdline/apt-cdrom.cc:162
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Ponovi to opravilo za preostanek CD-jev v vaąi zbirki."
+msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -268,18 +266,18 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uporaba: apt-config [moľnosti] ukaz\n"
+"Uporaba: apt-config [možnosti] ukaz\n"
"\n"
"apt-config je preprosto orodje za branje nastavitvene datoteke APT\n"
"\n"
"Ukazi:\n"
" shell - Lupinski način\n"
-" dump - Prikaľe nastavitve\n"
+" dump - Prikaže nastavitve\n"
"\n"
-"Moľnosti:\n"
+"Možnosti:\n"
" -h To besedilo pomoči.\n"
" -c=? Prebere podano datoteko z nastavitvami\n"
-" -o=? Nastavi poljubno nastavitveno moľnost, na primer. -o dir::cache=/tmp\n"
+" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -304,11 +302,11 @@ msgstr ""
"apt-extracttemplates je orodje za pridobivanje podatkov o\n"
"nastavitvah in predlogah debianovih paketov\n"
"\n"
-"Moľnosti:\n"
+"Možnosti:\n"
" -h To besedilo pomoči\n"
" -t Nastavi začasno mapo\n"
" -c=? Prebere podano datoteko z nastavitvami\n"
-" -o=? Nastavi poljubno nastavitveno moľnost, na primer. -o dir::cache=/tmp\n"
+" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
#, c-format
@@ -317,11 +315,11 @@ msgstr "Ni mogoče pisati na %s"
#: cmdline/apt-extracttemplates.cc:309
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameąčen?"
+msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
msgid "Package extension list is too long"
-msgstr "Seznam raząiritev paketov je predolg"
+msgstr "Seznam razširitev paketov je predolg"
#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
@@ -332,7 +330,7 @@ msgstr "Napaka med obdelavo mape %s"
#: ftparchive/apt-ftparchive.cc:260
msgid "Source extension list is too long"
-msgstr "Seznam raząiritev virov je predolg"
+msgstr "Seznam razširitev virov je predolg"
#: ftparchive/apt-ftparchive.cc:377
msgid "Error writing header to contents file"
@@ -384,7 +382,7 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"Uporaba: apt-ftparchive [moľnosti] ukaz\n"
+"Uporaba: apt-ftparchive [možnosti] ukaz\n"
"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n"
" sources srcpath [datoteka prepisa [predpona poti]]\n"
" contents path\n"
@@ -398,11 +396,11 @@ msgstr ""
"\n"
"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n"
"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n"
-"razprąilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
+"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
"vrednosti Prednosti in Odseka.\n"
"\n"
"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n"
-"Moľnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
+"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
"src\n"
"\n"
"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n"
@@ -412,16 +410,16 @@ msgstr ""
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
-"Moľnosti:\n"
+"Možnosti:\n"
" -h To besedilo pomoči\n"
" --md5 ustvarjanje nadzorne vsote MD5\n"
" -s=? datoteka prepisa vira\n"
" -q tiho\n"
" -d=? izbere izbirno podatkovno zbirko pomnilnika\n"
-" --no-delink omogoči način razhroąčevanja razvezovanja\n"
+" --no-delink omogoči način razhroščevanja razvezovanja\n"
" --contents nadzira ustvarjanje datoteke vsebine\n"
" -c=? prebere to nastavitveno datoteko\n"
-" -o=? nastavi poljubno moľnost nastavitve"
+" -o=? nastavi poljubno možnost nastavitve"
#: ftparchive/apt-ftparchive.cc:801
msgid "No selections matched"
@@ -435,19 +433,19 @@ msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "PZ je pokvarjena, datoteka je preimenovana v %s.old"
+msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "PZ je star, poskuąanje nadgradnje %s"
+msgstr "PZ je star, poskušanje nadgradnje %s"
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejąe "
+"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
#: ftparchive/cachedb.cc:77
@@ -494,7 +492,7 @@ msgstr "N: Napake se sklicujejo na datoteko "
#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
#, c-format
msgid "Failed to resolve %s"
-msgstr "Ni mogoče razreąiti %s"
+msgstr "Ni mogoče razrešiti %s"
#: ftparchive/writer.cc:174
msgid "Tree walking failed"
@@ -508,7 +506,7 @@ msgstr "Ni mogoče odprti %s"
#: ftparchive/writer.cc:260
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " RazVeľi %s [%s]\n"
+msgstr " RazVeži %s [%s]\n"
#: ftparchive/writer.cc:268
#, c-format
@@ -523,12 +521,12 @@ msgstr "Napaka med odvezovanjem %s"
#: ftparchive/writer.cc:279
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Napaka med povezovanju %s z %s"
+msgstr "*** Napaka med povezovanjem %s in %s"
#: ftparchive/writer.cc:289
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " Doseľena meja RazVezovanja %sB.\n"
+msgstr " Dosežena meja RazVezovanja %sB.\n"
#: ftparchive/writer.cc:393
msgid "Archive had no package field"
@@ -542,7 +540,7 @@ msgstr " %s nima prepisanega vnosa\n"
#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " Vzdrľevalec %s je %s in ne %s\n"
+msgstr " Vzdrževalec %s je %s in ne %s\n"
#: ftparchive/writer.cc:698
#, c-format
@@ -552,7 +550,7 @@ msgstr " %s nima izvornega vnosa prepisa\n"
#: ftparchive/writer.cc:702
#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s nima tudi binarnega vnosa prepisa\n"
+msgstr " %s nima tudi binarnega vnosa prepisa\n"
#: ftparchive/contents.cc:321
#, c-format
@@ -586,7 +584,7 @@ msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Napaka med branjem preprisane datoteke %s"
+msgstr "Napaka med branjem prepisane datoteke %s"
#: ftparchive/multicompress.cc:72
#, c-format
@@ -600,7 +598,7 @@ msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Ustvarjanje cevi IPC podopravila ni uspelo"
+msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
@@ -629,7 +627,7 @@ msgstr "Ni mogoče izvesti stiskanja "
#: ftparchive/multicompress.cc:360
msgid "decompressor"
-msgstr "program za raząirjanje"
+msgstr "program za razširjanje"
#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
@@ -660,17 +658,17 @@ msgstr "Napaka med prevajanjem logičnega izraza - %s"
#: cmdline/apt-get.cc:252
msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nereąene odvisnosti:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
#: cmdline/apt-get.cc:342
#, c-format
msgid "but %s is installed"
-msgstr "vendar je paket %s nameąčen"
+msgstr "vendar je paket %s nameščen"
#: cmdline/apt-get.cc:344
#, c-format
msgid "but %s is to be installed"
-msgstr "vendar bo paket %s nameąčen"
+msgstr "vendar bo paket %s nameščen"
#: cmdline/apt-get.cc:351
msgid "but it is not installable"
@@ -682,11 +680,11 @@ msgstr "vendar je navidezen paket"
#: cmdline/apt-get.cc:356
msgid "but it is not installed"
-msgstr "vendar ni nameąčen"
+msgstr "vendar ni nameščen"
#: cmdline/apt-get.cc:356
msgid "but it is not going to be installed"
-msgstr "vendar ne bo nameąčen"
+msgstr "vendar ne bo nameščen"
#: cmdline/apt-get.cc:361
msgid " or"
@@ -694,15 +692,15 @@ msgstr " ali"
#: cmdline/apt-get.cc:392
msgid "The following NEW packages will be installed:"
-msgstr "Naslednji NOVI paketi bodo nameąčeni:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
#: cmdline/apt-get.cc:420
msgid "The following packages will be REMOVED:"
-msgstr "Naslednji paketi bodo ODSTRANJENI:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
#: cmdline/apt-get.cc:442
msgid "The following packages have been kept back:"
-msgstr "Naslednji paketi so bili zadrľani:"
+msgstr "Naslednji paketi so bili zadržani:"
#: cmdline/apt-get.cc:465
msgid "The following packages will be upgraded:"
@@ -714,7 +712,7 @@ msgstr "Naslednji paketi bodo POSTARANI:"
#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
-msgstr "Naslednji zadrľani paketi bodo spremenjeni:"
+msgstr "Naslednji zadržani paketi bodo spremenjeni:"
#: cmdline/apt-get.cc:563
#, c-format
@@ -732,7 +730,7 @@ msgstr ""
#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nadgrajenih, %lu na novo nameąčenih, "
+msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
#: cmdline/apt-get.cc:609
#, c-format
@@ -752,7 +750,7 @@ msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
#: cmdline/apt-get.cc:617
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ne popolnoma nameąčenih ali odstranjenih.\n"
+msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
#: cmdline/apt-get.cc:639
#, c-format
@@ -771,15 +769,15 @@ msgstr "Paket %s je navidezen in ga je priskrbel:\n"
#: cmdline/apt-get.cc:673
msgid " [Installed]"
-msgstr " [Nameąčeno]"
+msgstr " [Nameščeno]"
#: cmdline/apt-get.cc:682
msgid " [Not candidate version]"
-msgstr "[Ni različica kandidata]"
+msgstr " [Ni različica kandidata]"
#: cmdline/apt-get.cc:684
msgid "You should explicitly select one to install."
-msgstr "Sami izberite paket, ki ga ľelite namestiti."
+msgstr "Sami izberite paket, ki ga želite namestiti."
#: cmdline/apt-get.cc:687
#, c-format
@@ -788,13 +786,13 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Paket %s nima navedene različice, vendar se nanj nanaąa nek drug paket.\n"
+"Paket %s nima navedene različice, vendar se nanj nanaša nek drug paket.\n"
"To ponavadi pomeni, da paket manjka, je zastaran ali\n"
"pa je na voljo samo iz drugega vira.\n"
#: cmdline/apt-get.cc:705
msgid "However the following packages replace it:"
-msgstr "Vendar ga naslednji paketi nadomestijo:"
+msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
#: cmdline/apt-get.cc:717
#, c-format
@@ -814,27 +812,27 @@ msgstr "Izbiranje '%s' namesto '%s'\n"
#: cmdline/apt-get.cc:789
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s je preskočen, ker je ľe nameąčen in ne potrebuje nadgradnje.\n"
+msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n"
#: cmdline/apt-get.cc:793
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Preskok %s, ni nameąčen in zahtevane so le nadgradnje.\n"
+msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n"
#: cmdline/apt-get.cc:803
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ponovna namestitev %s ni moľna, ker prejem ni moľen.\n"
+msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
#: cmdline/apt-get.cc:808
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "Najnovejąa različica %s je ľe nameąčena.\n"
+msgstr "Najnovejša različica %s je že nameščena.\n"
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2067
#, c-format
msgid "%s set to manually installed.\n"
-msgstr "%s je bil nastavljen na ročno nameąčen.\n"
+msgstr "%s je bil nastavljen na ročno nameščen.\n"
#: cmdline/apt-get.cc:853
#, c-format
@@ -842,14 +840,14 @@ msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Izbrana različica '%s' (%s) za '%s'\n"
#: cmdline/apt-get.cc:858
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Izbrana različica '%s' (%s) za '%s'\n"
+msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
#: cmdline/apt-get.cc:899
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Paket %s ni nameąčen, zato ni odstranjen\n"
+msgstr "Paket %s ni nameščen, zato ni odstranjen\n"
#: cmdline/apt-get.cc:977
msgid "Correcting dependencies..."
@@ -865,7 +863,7 @@ msgstr "Ni mogoče popraviti odvisnosti"
#: cmdline/apt-get.cc:986
msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjąati zbirke za nadgradnjo"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
#: cmdline/apt-get.cc:988
msgid " Done"
@@ -873,11 +871,11 @@ msgstr " Opravljeno"
#: cmdline/apt-get.cc:992
msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če ľelite popraviti napake, poskusite pognati 'apt-get -f install'."
+msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
#: cmdline/apt-get.cc:995
msgid "Unmet dependencies. Try using -f."
-msgstr "Nereąene odvisnosti. Poskusite uporabiti -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
#: cmdline/apt-get.cc:1020
msgid "WARNING: The following packages cannot be authenticated!"
@@ -889,7 +887,7 @@ msgstr "Opozorilo overitve je bilo prepisano.\n"
#: cmdline/apt-get.cc:1031
msgid "Install these packages without verification [y/N]? "
-msgstr "Ali ľelite te pakete namestiti brez prevejanja [y/N]? "
+msgstr "Ali želite te pakete namestiti brez preverjanja [y/N]? "
#: cmdline/apt-get.cc:1033
msgid "Some packages could not be authenticated"
@@ -897,7 +895,7 @@ msgstr "Nekaterih paketkov bi bilo mogoče overiti"
#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
msgid "There are problems and -y was used without --force-yes"
-msgstr "Priąlo je do teľav in -y je bil uporabljen brez --force-yes"
+msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
#: cmdline/apt-get.cc:1083
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -914,8 +912,8 @@ msgstr "Notranja napaka, Urejanje se ni končalo"
#: cmdline/apt-get.cc:1141
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-"Kako čudno .. Velikosti se ne ujemata, poąljite sporočilo na apt@packages."
-"debian.org"
+"Kako čudno .. Velikosti se ne ujemata, pošljite sporočilo na "
+"apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -943,10 +941,10 @@ msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
#: cmdline/apt-get.cc:1165
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Po tem opravilu bo sproąčenega %sB prostora na disku.\n"
+msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
-#: cmdline/apt-get.cc:2431
+#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2471
+#: cmdline/apt-get.cc:2474
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ni mogoče določiti prostega prostora v %s"
@@ -958,7 +956,7 @@ msgstr "Na %s je premalo prostora."
#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Navedena je moľnost Samo preprosto, a to opravilo ni preprosto."
+msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
#: cmdline/apt-get.cc:1211
msgid "Yes, do as I say!"
@@ -971,7 +969,7 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Naredili boste nekaj, kar je morda lahko ąkodljivo.\n"
+"Naredili boste nekaj, kar je morda lahko škodljivo.\n"
"Za nadaljevanje vtipkajte frazo '%s'\n"
" ?] "
@@ -981,9 +979,9 @@ msgstr "Prekini."
#: cmdline/apt-get.cc:1234
msgid "Do you want to continue [Y/n]? "
-msgstr "Ali ľelite nadaljevati [Y/n]? "
+msgstr "Ali želite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491
+#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2531 apt-pkg/algorithms.cc:1491
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
@@ -992,7 +990,7 @@ msgstr "Ni mogoče dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prejem nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
+#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2540
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
@@ -1024,16 +1022,16 @@ msgid_plural ""
"The following packages disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
-"Naslednji paketi so izginili z vaąega sistema, ker so vse\n"
+"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
"datoteke prepisali drugi paketi:"
msgstr[1] ""
-"Naslednji paketi je izginil z vaąega sistema, ker so vse\n"
+"Naslednji paketi je izginil z vašega sistema, ker so vse\n"
"datoteke prepisali drugi paketi:"
msgstr[2] ""
-"Naslednja paketa sta izginila z vaąega sistema, ker so vse\n"
+"Naslednja paketa sta izginila z vašega sistema, ker so vse\n"
"datoteke prepisali drugi paketi:"
msgstr[3] ""
-"Naslednji paketi so izginili z vaąega sistema, ker so vse\n"
+"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
"datoteke prepisali drugi paketi:"
#: cmdline/apt-get.cc:1373
@@ -1043,7 +1041,7 @@ msgstr "Opomba: To je dpkg storil samodejno in namenoma."
#: cmdline/apt-get.cc:1503
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Prezri nerazpoloľljiv cilj izdaje '%s' paketa '%s'"
+msgstr "Prezri nerazpoložljiv cilj izdaje '%s' paketa '%s'"
#: cmdline/apt-get.cc:1535
#, c-format
@@ -1054,7 +1052,7 @@ msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
#: cmdline/apt-get.cc:1573
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Prezri nerazpoloľljivo različico '%s' paketa '%s'"
+msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'"
#: cmdline/apt-get.cc:1589
msgid "The update command takes no arguments"
@@ -1066,16 +1064,16 @@ msgstr ""
"Program ne bi smel brisati stvari, ni mogoče zagnati "
"SamodejnegaOdstranjevalnika"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1746
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
"Videti je, da je SamodejniOdstranjevalnik nekaj uničil, kar se ne bi smelo "
"zgoditi\n"
-"Poąljite poročilo o hroąču v apt. "
+"Pošljite poročilo o hrošču v apt."
-#.
+#.
#. if (Packages == 1)
#. {
#. c1out << endl;
@@ -1084,58 +1082,61 @@ msgstr ""
#. "the package is simply not installable and a bug report against\n"
#. "that package should be filed.") << endl;
#. }
-#.
-#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
+#.
+#: cmdline/apt-get.cc:1749 cmdline/apt-get.cc:1898
msgid "The following information may help to resolve the situation:"
-msgstr "Naslednji podatki vam bodo morda pomagali reąiti teľavo:"
+msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1753
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
-#: cmdline/apt-get.cc:1717
+#: cmdline/apt-get.cc:1760
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr[0] "Naslednji paketi so bili samodejno nameąčeni in niso več zahtevani:"
-msgstr[1] "Naslednji paket je bil samodejno nameąčen in ni več zahtevan:"
+msgstr[0] ""
+"Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
+msgstr[1] "Naslednji paket je bil samodejno nameščen in ni več zahtevan:"
msgstr[2] ""
-"Naslednja paketa sta bila samodejno nameąčena in nista več zahtevana:"
-msgstr[3] "Naslednji paketi so bili samodejno nameąčeni in niso več zahtevani:"
+"Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
+msgstr[3] ""
+"Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
-#: cmdline/apt-get.cc:1721
+#: cmdline/apt-get.cc:1764
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu paketov je bilo samodejno nameąčenih in niso več zahtevane.\n"
-msgstr[1] "%lu paket je bil samodejno nameąčen in ni bil več zahtevan.\n"
-msgstr[2] "%lu paketa sta bila samodejno nameąčena in nista več zahtevana.\n"
-msgstr[3] "%lu paketi so bili samodejno nameąčeni in niso več zahtevani.\n"
+msgstr[0] "%lu paketov je bilo samodejno nameščenih in niso več zahtevani.\n"
+msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
+msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
+msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1766
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev. "
+msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev."
-#: cmdline/apt-get.cc:1742
+#: cmdline/apt-get.cc:1785
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1825
+#: cmdline/apt-get.cc:1868
msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Poskusite zagnati 'apt-get -f install', če ľelite popraviti naslednje:"
+msgstr ""
+"Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
-#: cmdline/apt-get.cc:1828
+#: cmdline/apt-get.cc:1871
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Nereąene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
-"navedite reąitev)."
+"Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
+"navedite rešitev)."
-#: cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:1883
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1143,81 +1144,81 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
"Nekaterih paketov ni mogoče namestiti. To lahko pomeni, da ste zahtevali\n"
-"nemogoč poloľaj, če uporabljate nestabilno izdajo pa\n"
-", da nekateri zahtevani paketi ąe niso ustvarjeni ali premaknjeni\n"
+"nemogoč položaj, če uporabljate nestabilno izdajo pa\n"
+", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
" iz Prihajajočega."
-#: cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1901
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1929
msgid "The following extra packages will be installed:"
-msgstr "Naslednji dodatni paketi bodo nameąčeni:"
+msgstr "Naslednji dodatni paketi bodo nameščeni:"
-#: cmdline/apt-get.cc:1976
+#: cmdline/apt-get.cc:2019
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1977
+#: cmdline/apt-get.cc:2020
msgid "Recommended packages:"
msgstr "Priporočeni paketi:"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2062
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "%s je nastavljen na samodejno nameąčen.\n"
+msgstr "%s je nastavljen na samodejno nameščen.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2090
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2093 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:2055
+#: cmdline/apt-get.cc:2098
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2165 cmdline/apt-get.cc:2173
msgid "Internal error, problem resolver broke stuff"
-msgstr "Notranja napaka, reąevalnik teľav je pokvaril stvari"
+msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
-#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
+#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2230
msgid "Unable to lock the download directory"
msgstr "Ni mogoče zakleniti mape prejemov"
-#: cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Prejemanje %s %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2337
msgid "Must specify at least one package to fetch source for"
msgstr ""
-"Potrebno je navesti vsaj en paket, za katerega ľelite dobiti izvorno kodo"
+"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2377 cmdline/apt-get.cc:2658
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoče najti"
-#: cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2393
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-"OPOMBA: pakiranje '%s' vzdrľevano v sistemu nadzora različice '%s' na:\n"
+"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
"%s\n"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2398
#, c-format
msgid ""
"Please use:\n"
@@ -1228,87 +1229,89 @@ msgstr ""
"bzr get %s\n"
"za pridobivanje zadnjih (morda neizdanih) posodobitev paketa.\n"
-#: cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Preskok ľe prejete datoteke '%s'\n"
+msgstr "Preskok že prejete datoteke '%s'\n"
-#: cmdline/apt-get.cc:2441
+#: cmdline/apt-get.cc:2484
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2492
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2454
+#: cmdline/apt-get.cc:2497
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2460
+#: cmdline/apt-get.cc:2503
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2493
+#: cmdline/apt-get.cc:2536
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2566
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Odpakiranje ľe odpakiranih izvornih paketov v %s je bilo preskočeno\n"
+msgstr ""
+"Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n"
-#: cmdline/apt-get.cc:2535
+#: cmdline/apt-get.cc:2578
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2536
+#: cmdline/apt-get.cc:2579
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Izberite, če je paket 'dpkg-dev' nameąčen.\n"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2596
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2573
+#: cmdline/apt-get.cc:2616
msgid "Child process failed"
msgstr "Podrejeno opravilo ni uspelo"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2632
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Potrebno je navesti vsaj en paket, za katerega ľelite preveriti odvisnosti "
+"Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2620
+#: cmdline/apt-get.cc:2663
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2640
+#: cmdline/apt-get.cc:2683
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2734
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
+msgstr ""
+"%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:2744
+#: cmdline/apt-get.cc:2787
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1317,37 +1320,37 @@ msgstr ""
"%s odvisnosti za %s ni mogoče zadostiti, ker nobena različica paketa %s ne "
"more zadostiti zahtevi po različici"
-#: cmdline/apt-get.cc:2780
+#: cmdline/apt-get.cc:2823
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Ni mogoče zadostiti %s odvisnosti za %s. Nameąčen paket %s je preveč nov"
+"Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov"
-#: cmdline/apt-get.cc:2807
+#: cmdline/apt-get.cc:2850
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s"
-#: cmdline/apt-get.cc:2823
+#: cmdline/apt-get.cc:2866
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti."
-#: cmdline/apt-get.cc:2828
+#: cmdline/apt-get.cc:2871
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2964 cmdline/apt-get.cc:2976
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "Povezovanje z %s (%s)"
+msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:3052
+#: cmdline/apt-get.cc:3098
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:3093
-#, fuzzy
+#: cmdline/apt-get.cc:3139
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1394,48 +1397,51 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Uporaba: apt-get [moľnosti] ukaz\n"
-" apt-get [moľnosti] install|remove paket1 [paket2 ...]\n"
-" apt-get [moľnosti] source paket1 [paket2 ...]\n"
+"Uporaba: apt-get [možnosti] ukaz\n"
+" apt-get [možnosti] install|remove pak1 [pak2 ...]\n"
+" apt-get [možnosti] source pak1 [pak2 ...]\n"
"\n"
-"apt-get je enostaven vmesnik ukazne vrstice za prejemanje in\n"
-"nameąčanje paketov. Najpogosteje uporabljana ukaza sta update\n"
-"in install.\n"
+"apt-get je enostaven vmesnik ukazne vrstice za prejemanje\n"
+"in nameščanje paketov. Najpogosteje uporabljena ukaza\n"
+"sta update in install.\n"
"\n"
"Ukazi:\n"
-" update - pridobi nov seznam paketov\n"
-" upgrade - izvede nadgradnjo install - namesti nove pakete (paket je libc6 "
-"ne libc6.deb)\n"
-" remove - odstrani pakete\n"
-" autoremove - samodejno odstrani vse neuporabljene pakete\n"
-" purge - odstrani pakete in nastavitvene datoteke\n"
-" source - prejme izvorne arhive\n"
-" build-deb - nastavi odvisnosti gradnje za izvorne pakete\n"
-" dist-upgrade - nadgradi distribucijo, oglejte si apt-get(8)\n"
-" dselect-upgrade - sledi naslednjim izbiram\n"
-" clean - izbriąe prejete datoteke arhivov\n"
-" markauto - označi dane pakete kot samodejno nameąčene\n"
-" unmarkauto - odstrani dane pakete kot ročno nameąčene\n"
+" update - pridobi sezname novih paketov\n"
+" upgrade - izvede nadgradnjo\n"
+" install - namesti nove pakete (paket je libc6, ne libc6.deb)\n"
+" remove - odstrani pakete\n"
+" autoremove - samodejno odstrani vse neuporabljene pakete\n"
+" purge - odstrani pakete in nastavitvene datoteke\n"
+" source - prejme arhive izvorne kode\n"
+" dist-upgrade - nadgradnja distrbucije, oglejte si apt-get(8)\n"
+" dselect-upgrade - sledi izbiram dselect\n"
+" clean - izbriši prejete datoteke arhiva\n"
+" autoclean - izbriše stare prejete datoteke arhiva\n"
+" check - preveri, da ni zlomljenih odvisnosti\n"
+" markauto - označi dane pakete kot samodejno nameščene\n"
+" unmarkauto - označi dane pakete kot ročno nameščene\n"
+" changelog - prejme in prikaže dnevnik sprememb za dani paket\n"
+" download - prejme binarni paket v trenutno mapo\n"
"\n"
-"Moľnosti:\n"
-" -h to besedilo pomoči\n"
-" -q beleľljiv izhod - brez pokazatelja napredka\n"
-" -qq brez izhoda razen za napake\n"
-" -d le prejme - NE namesti ali razpakira arhivov\n"
-" -s izvede simulacijo ukaza.\n"
-" -y predpostavi y za vsa vpraąanja in ne spraąuje\n"
-" -f poskuąa popraviti sistem s pokvarjenimi odvisnostmi\n"
-" -m poskuąa nadaljevati, če arhivov ni mogoče najti\n"
-" -u pokaľe tudi seznam nadgrajenih paketov\n"
-" -b izgradi izvorni paket po njegovem pridobivanju\n"
-" -V pokaľe podroben izpis ątevila različice\n"
-" -c=? prebere to nastavitveno datoteko\n"
-" -o=? nastavi poljubno nastavitveno moľnost, na primer -0 dir::cache=/tmp\n"
-"Oglejte si strani apt-get(8), sources.list(5) in priročnik apt.conf(5)\n"
-" za več podrobnosti in moľnosti.\n"
-" Ta APT ima moči Super Krav.\n"
-
-#: cmdline/apt-get.cc:3254
+"Možnosti:\n"
+" -h to besedilo pomoči.\n"
+" -q beležljiv izhod - brez indikatorja napredka\n"
+" -qq ni izhoda razen napak\n"
+" -d le prejmi - NE namesti ali odpakiraj arhivov\n"
+" -s izvedi simulacijo ukaza\n"
+" -y predpostavi Yes za vsa vprašanja in ne postavljaj vprašanj\n"
+" -f poskusi popraviti sistem z zlomljenimi odvisnostmi\n"
+" -m poskusi nadaljevati, če arhivov ni mogoče najti\n"
+" -u pokaži tudi seznam nadgrajenih paketov\n"
+" -b izgradi izvorni paket po njegovem pridobivanju\n"
+" -V pokaže podrobno izpisane številke različic\n"
+" -c=? prebere to nastavitveno datoteko\n"
+" -o=? nastavi poljubno nastavitveno možnost, na primer dir::cache=/temo\n"
+"Za več podrobnosti in možnosti si oglejte priročnike apt-get(8),\n"
+"sources.list(5) in apt.conf(5).\n"
+" Ta APT ima zmožnosti Super krave.\n"
+
+#: cmdline/apt-get.cc:3300
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1444,7 +1450,7 @@ msgid ""
msgstr ""
"OPOMBA: To je samo simulacija!\n"
" apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n"
-" Zaklepanje je onemogočeno, zato se ne zanaąajte\n"
+" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
" na pomembnost trenutnega pravega stanja!"
#: cmdline/acqprogress.cc:57
@@ -1457,7 +1463,7 @@ msgstr "Dobi:"
#: cmdline/acqprogress.cc:112
msgid "Ign "
-msgstr "Prezri"
+msgstr "Prezr "
#: cmdline/acqprogress.cc:116
msgid "Err "
@@ -1501,17 +1507,17 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uporaba: apt-sortpkgs [moľnosti] dat1 [dat2 ...]\n"
+"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
"\n"
-"apt-sortpkgs je preprosto orodje za razvrąčanje paketnih datotek. Moľnost -"
+"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -"
"s\n"
"določa vrsto datoteke.\n"
"\n"
-"Moľnosti:\n"
+"Možnosti:\n"
" -h to besedilo pomoči\n"
-" -s uporabi razvrąčanje izvornih datotek\n"
+" -s uporabi razvrščanje izvornih datotek\n"
" -c=? Prebere podano datoteko z nastavitvami\n"
-" -o=? Nastavi poljubno nastavitveno moľnost, npr. -o dir::cache=/tmp\n"
+" -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1524,12 +1530,12 @@ msgstr "Za nadaljevanje pritisnite vnosno tipko."
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Ali ľelite izbrisati vse predhodno prejete datoteke .deb?"
+msgstr "Ali želite izbrisati vse predhodno prejete datoteke .deb?"
#: dselect/install:101
msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr ""
-"Med raząirajanjem je priąlo do nekaterih napak. Paketi, ki so bili nameąčeni"
+"Med razširajanjem je prišlo do nekaterih napak. Paketi, ki so bili nameščeni"
#: dselect/install:102
msgid "will be configured. This may result in duplicate errors"
@@ -1544,11 +1550,11 @@ msgstr ""
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr "nad tem sporočilom. Popravite jih in poľenite Namest[I]tev ąe enkrat"
+msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
#: dselect/update:30
msgid "Merging available information"
-msgstr "Zdruľevanje razpoloľljivih podaktov"
+msgstr "Združevanje razpoložljivih podaktov"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
@@ -1598,11 +1604,11 @@ msgstr "Glav arhiva ni mogoče brati"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "DropNode je poklical stabilno povezano vozliąče"
+msgstr "DropNode je poklical stabilno povezano vozlišče"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Ni mogoče najti razprąenega elementa!"
+msgstr "Ni mogoče najti razpršenega elementa!"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
@@ -1620,7 +1626,7 @@ msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "Dvojni seątevek odklona %s -> %s"
+msgstr "Dvojni seštevek odklona %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
@@ -1655,7 +1661,7 @@ msgstr "Mapa %s je odklonjena"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paket poskuąa pisati v tarčo odklona %s/%s"
+msgstr "Paket poskuša pisati v tarčo odklona %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
@@ -1668,7 +1674,7 @@ msgstr "Mapa %s je bil zamenjana z ne-mapo"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "Iskanje vozliąča v njegovem razprąenem vedru ni uspelo"
+msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
#: apt-inst/extract.cc:284
msgid "The path is too long"
@@ -1677,7 +1683,7 @@ msgstr "Pot je predolga"
#: apt-inst/extract.cc:412
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "Prepiąi zadetek paketa brez vnosa različice za %s"
+msgstr "Prepiši zadetek paketa brez vnosa različice za %s"
#: apt-inst/extract.cc:429
#, c-format
@@ -1687,9 +1693,9 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
+#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:106
+#: apt-pkg/init.cc:114 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
@@ -1756,7 +1762,7 @@ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
-msgstr "Notranja napaka med dobivanjem vozliąča"
+msgstr "Notranja napaka med dobivanjem vozlišča"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
@@ -1825,7 +1831,7 @@ msgstr "Nadzorne datoteke ni mogoče razčleniti"
#: methods/bzip2.cc:60 methods/gzip.cc:52
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
#: methods/bzip2.cc:64
#, c-format
@@ -1858,7 +1864,7 @@ msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"Uporabite apt-cdrom, če ľelite, da APT prepozna CD. apt-get update ne more "
+"Uporabite apt-cdrom, če želite, da APT prepozna CD. apt-get update ne more "
"sam dodati novih CD-ROM-ov"
#: methods/cdrom.cc:218
@@ -1868,7 +1874,7 @@ msgstr "Napačen CD-ROM"
#: methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda ąe v uporabi."
+msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi."
#: methods/cdrom.cc:250
msgid "Disk not found."
@@ -1898,35 +1904,35 @@ msgstr "Ni mogoče določiti krajevnega imena"
#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Streľnik je zavrnil povezavo in sporočil: %s"
+msgstr "Strežnik je zavrnil povezavo in sporočil: %s"
#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER je spodletel, streľnik je odgovoril: %s"
+msgstr "USER je spodletel, strežnik je odgovoril: %s"
#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS je spodletel, streľnik je odgovoril: %s"
+msgstr "PASS je spodletel, strežnik je odgovoril: %s"
#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Naveden je bil posredniąki streľnik, ne pa tudi prijavni skript. Acquire::"
-"ftp::ProxyLogin je prazen."
+"Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. "
+"Acquire::ftp::ProxyLogin je prazen."
#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Ukaz prijavne skripte '%s' ni uspel, streľnik je odgovoril: %s"
+msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s"
#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE je spodletel, streľnik je odgovoril: %s"
+msgstr "TYPE je spodletel, strežnik je odgovoril: %s"
#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
@@ -1934,9 +1940,9 @@ msgstr "Povezava je zakasnela"
#: methods/ftp.cc:341
msgid "Server closed the connection"
-msgstr "Streľnik je zaprl povezavo"
+msgstr "Strežnik je zaprl povezavo"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:190
msgid "Read error"
msgstr "Napaka branja"
@@ -1948,7 +1954,7 @@ msgstr "Odgovor je prekoračil predpomnilnik."
msgid "Protocol corruption"
msgstr "Okvara protokola"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:232
msgid "Write error"
msgstr "Napaka pisanja"
@@ -1966,7 +1972,7 @@ msgstr "Ni mogoče povezat pasivnega vtiča."
#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo ni mogel dobiti posluąajočega vtiča"
+msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča"
#: methods/ftp.cc:741
msgid "Could not bind a socket"
@@ -1974,7 +1980,7 @@ msgstr "Ni mogoče povezati vtiča"
#: methods/ftp.cc:745
msgid "Could not listen on the socket"
-msgstr "Ni mogoče posluąati na vtiču"
+msgstr "Ni mogoče poslušati na vtiču"
#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
@@ -1987,12 +1993,12 @@ msgstr "Ni mogoče poslati ukaza PORT"
#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "Neznan naslov druľine %u (AF_*)"
+msgstr "Neznan naslov družine %u (AF_*)"
#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT ni uspel, streľnik je odgovoril: %s"
+msgstr "EPRT ni uspel, strežnik je odgovoril: %s"
#: methods/ftp.cc:823
msgid "Data socket connect timed out"
@@ -2004,12 +2010,12 @@ msgstr "Ni mogoče sprejeti povezave"
#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
msgid "Problem hashing file"
-msgstr "Teľava med razprąevanjem datoteke"
+msgstr "Težava med razprševanjem datoteke"
#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Ni mogoče pridobiti datoteke, streľnik je odgovoril '%s'"
+msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'"
#: methods/ftp.cc:897 methods/rsh.cc:321
msgid "Data socket timed out"
@@ -2018,7 +2024,7 @@ msgstr "Podatkovna vtič je potekel"
#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Prenos podatkov ni uspel, streľnik je odgovoril '%s'"
+msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'"
#. Get the files information
#: methods/ftp.cc:1004
@@ -2069,17 +2075,17 @@ msgstr "Povezovanje z %s"
#: methods/connect.cc:168 methods/connect.cc:187
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Ni mogoče razreąiti '%s'"
+msgstr "Ni mogoče razrešiti '%s'"
#: methods/connect.cc:193
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Začasna napaka med razreąevanjem '%s'"
+msgstr "Začasna napaka med razreševanjem '%s'"
#: methods/connect.cc:196
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Nekaj čudnega se je zgodilo med razreąevanjem '%s:%s' (%i - %s)"
+msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
#: methods/connect.cc:243
#, c-format
@@ -2090,7 +2096,7 @@ msgstr "Ni se mogoče povezati z %s:%s:"
#: methods/gpgv.cc:71
#, c-format
msgid "No keyring installed in %s."
-msgstr "V %s ni nameąčenih zbirk ključev."
+msgstr "V %s ni nameščenih zbirk ključev."
#: methods/gpgv.cc:163
msgid ""
@@ -2104,7 +2110,7 @@ msgstr "Najden je bil vsaj en neveljaven podpis."
#: methods/gpgv.cc:172
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameąčen?)"
+msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)"
#: methods/gpgv.cc:177
msgid "Unknown error executing gpgv"
@@ -2136,19 +2142,19 @@ msgstr "Neveljavna vrstica glave"
#: methods/http.cc:564 methods/http.cc:571
msgid "The HTTP server sent an invalid reply header"
-msgstr "Streľnik HTTP je poslal neveljavno glavo odgovora"
+msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora"
#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Streľnik HTTP je poslal glavo z neveljavno dolľino vsebine"
+msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine"
#: methods/http.cc:615
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Streľnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
+msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
#: methods/http.cc:617
msgid "This HTTP server has broken range support"
-msgstr "Ta streľnik HTTP ima pokvarjen obseg podpore"
+msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
#: methods/http.cc:641
msgid "Unknown date format"
@@ -2176,11 +2182,11 @@ msgstr "Napaka med pisanjem v datoteko"
#: methods/http.cc:900
msgid "Error reading from server. Remote end closed connection"
-msgstr "Napaka med branjem s streľnika. Oddaljeni del je zaprl povezavo"
+msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
#: methods/http.cc:902
msgid "Error reading from server"
-msgstr "Napaka med branjem s streľnika"
+msgstr "Napaka med branjem s strežnika"
#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
msgid "Failed to truncate file"
@@ -2188,7 +2194,7 @@ msgstr "Ni mogoče obrezati datoteke"
#: methods/http.cc:1160
msgid "Bad header data"
-msgstr "Slabi podatki glave"
+msgstr "Napačni podatki glave"
#: methods/http.cc:1177 methods/http.cc:1232
msgid "Connection failed"
@@ -2235,7 +2241,7 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov ľe doseľena."
+"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena."
#: apt-pkg/contrib/mmap.cc:404
msgid ""
@@ -2275,7 +2281,7 @@ msgstr "Izbire %s ni mogoče najti"
#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Neprepoznana vrsta okrająave: '%c'"
+msgstr "Neprepoznana vrsta okrajšave: '%c'"
#: apt-pkg/contrib/configuration.cc:510
#, c-format
@@ -2320,9 +2326,10 @@ msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
#: apt-pkg/contrib/configuration.cc:777
#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo moľnosti kot argument"
+"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument"
#: apt-pkg/contrib/configuration.cc:827
#, c-format
@@ -2342,38 +2349,38 @@ msgstr "%c%s ... Narejeno"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Moľnost ukazne vrstice '%c' [iz %s] ni poznana."
+msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana."
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
-msgstr "Moľnosti ukazne vrstice %s ni mogoče razumeti"
+msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "Moľnost ukazne vrstice %s ni boolova vrednost"
+msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
#, c-format
msgid "Option %s requires an argument."
-msgstr "Moľnost %s zahteva argument."
+msgstr "Možnost %s zahteva argument."
#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Moľnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
+msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
#: apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Moľnost %s zahteva celoątevilski argument, ne '%s'"
+msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
#: apt-pkg/contrib/cmndline.cc:267
#, c-format
msgid "Option '%s' is too long"
-msgstr "Moľnost '%s' je predolga"
+msgstr "Možnost '%s' je predolga"
#: apt-pkg/contrib/cmndline.cc:300
#, c-format
@@ -2401,115 +2408,116 @@ msgstr "Ni mogoče spremeniti v %s"
msgid "Failed to stat the cdrom"
msgstr "Ni mogoče določiti CD-ROM-a"
-#: apt-pkg/contrib/fileutl.cc:159
+#: apt-pkg/contrib/fileutl.cc:168
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s"
-#: apt-pkg/contrib/fileutl.cc:164
+#: apt-pkg/contrib/fileutl.cc:173
#, c-format
msgid "Could not open lock file %s"
msgstr "Ni mogoče odprti zaklenjene datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:182
+#: apt-pkg/contrib/fileutl.cc:191
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
-#: apt-pkg/contrib/fileutl.cc:186
+#: apt-pkg/contrib/fileutl.cc:195
#, c-format
msgid "Could not get lock %s"
msgstr "Ni mogoče zakleniti datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:326
+#: apt-pkg/contrib/fileutl.cc:335
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa"
-#: apt-pkg/contrib/fileutl.cc:353
+#: apt-pkg/contrib/fileutl.cc:362
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:380
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek"
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:389
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:679
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
-#: apt-pkg/contrib/fileutl.cc:682
+#: apt-pkg/contrib/fileutl.cc:691
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
-#: apt-pkg/contrib/fileutl.cc:684
+#: apt-pkg/contrib/fileutl.cc:693
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Pod-opravilo %s je prejelo signal %u."
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:697
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:699
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
-#: apt-pkg/contrib/fileutl.cc:755
+#: apt-pkg/contrib/fileutl.cc:764
#, c-format
msgid "Could not open file %s"
msgstr "Ni mogoče odpreti datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:772
+#: apt-pkg/contrib/fileutl.cc:781
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Ni mogoče odpreti opisnika datotek %d"
-#: apt-pkg/contrib/fileutl.cc:832
+#: apt-pkg/contrib/fileutl.cc:841
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "branje, ąe vedno %lu za branje, a nobeden ni ostal"
+msgstr "branje, še vedno %lu za branje, a nobeden ni ostal"
-#: apt-pkg/contrib/fileutl.cc:865
+#: apt-pkg/contrib/fileutl.cc:874
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "pisanje, ąe vedno %lu za pisanje, a ni mogoče"
+msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče"
-#: apt-pkg/contrib/fileutl.cc:1001
+#: apt-pkg/contrib/fileutl.cc:1010
#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Teľava med zapiranjem gzip datoteke %s"
+msgstr "Težava med zapiranjem gzip datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1004
+#: apt-pkg/contrib/fileutl.cc:1013
#, c-format
msgid "Problem closing the file %s"
-msgstr "Teľava med zapiranjem datoteke %s"
+msgstr "Težava med zapiranjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1009
+#: apt-pkg/contrib/fileutl.cc:1018
#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Teľava med preimenovanje datoteke %s v %s"
+msgstr "Težava med preimenovanje datoteke %s v %s"
-#: apt-pkg/contrib/fileutl.cc:1020
+#: apt-pkg/contrib/fileutl.cc:1029
#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Teľava med razvezovanjem datoteke %s"
+msgstr "Težava med razvezovanjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1033
+#: apt-pkg/contrib/fileutl.cc:1042
msgid "Problem syncing the file"
-msgstr "Teľava med usklajevanjem datoteke"
+msgstr "Težava med usklajevanjem datoteke"
#: apt-pkg/pkgcache.cc:145
msgid "Empty package cache"
@@ -2521,7 +2529,7 @@ msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
#: apt-pkg/pkgcache.cc:156
msgid "The package cache file is an incompatible version"
-msgstr "Različica datoteke s predpomnilnikom paketov ni zdruľljiva"
+msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva"
#: apt-pkg/pkgcache.cc:161
#, c-format
@@ -2566,7 +2574,7 @@ msgstr "Pokvari"
#: apt-pkg/pkgcache.cc:295
msgid "Enhances"
-msgstr "Izboljąa"
+msgstr "Izboljša"
#: apt-pkg/pkgcache.cc:306
msgid "important"
@@ -2574,7 +2582,7 @@ msgstr "pomembno"
#: apt-pkg/pkgcache.cc:306
msgid "required"
-msgstr "zahtevano"
+msgstr "obvezno"
#: apt-pkg/pkgcache.cc:306
msgid "standard"
@@ -2633,18 +2641,20 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-"Slabo oblikovana vrstica %lu na seznamu virov %s ([moľnosti] ni mogoče "
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
"razčleniti)"
#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([moľnost] prekratka)"
+msgstr ""
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
#: apt-pkg/sourcelist.cc:106
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
+msgstr ""
+"Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
#: apt-pkg/sourcelist.cc:112
#, c-format
@@ -2703,7 +2713,7 @@ msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana "
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
#, c-format
@@ -2722,8 +2732,8 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi "
-"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares ľelite "
-"nadaljevati, vključite moľnost APT::Force-LoopBreak."
+"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
+"nadaljevati, vključite možnost APT::Force-LoopBreak."
#: apt-pkg/packagemanager.cc:495
#, c-format
@@ -2731,8 +2741,8 @@ msgid ""
"Could not perform immediate configuration on already unpacked '%s'. Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
-"Ni mogoče izvesti takojąnje nastavitve ľe razpakiranega '%s'. Oglejte si man "
-"5 apt.conf pod APT::Takojąnja-Nastavitev za podrobnosti"
+"Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si man "
+"5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2743,28 +2753,28 @@ msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Paket %s mora biti znova nameąčen, vendar ni mogoče najti arhiva zanj."
+msgstr ""
+"Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj."
#: apt-pkg/algorithms.cc:1239
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Napaka. pkgProblemResolver::Napake pri razreąitvi, ki so jih morda "
-"povzročili zadrľani paketi."
+"Napaka. pkgProblemResolver::Napake pri razrešitvi, ki so jih morda "
+"povzročili zadržani paketi."
#: apt-pkg/algorithms.cc:1241
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ni mogoče popraviti teľav. Imate pokvarjene pakete."
+msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
-#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
-"Nekaterih kazal ni mogoče prejeti, zato so prezrta, ali pa so uporabljena "
-"starejąa."
+"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
+"namesto njih uporabljene stare."
#: apt-pkg/acquire.cc:79
#, c-format
@@ -2805,15 +2815,16 @@ msgstr "Način %s se ni začel pravilno"
#: apt-pkg/acquire-worker.cc:413
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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:146
+#: apt-pkg/init.cc:149
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:165
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
@@ -2832,7 +2843,7 @@ msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja."
#: apt-pkg/cachefile.cc:88
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Za odpravljanje teľav poskusite zagnati apt-get update."
+msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
#: apt-pkg/cachefile.cc:106
msgid "The list of sources could not be read."
@@ -2841,7 +2852,7 @@ msgstr "Seznama virov ni mogoče brati."
#: apt-pkg/policy.cc:346
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neveljaven zapis v datoteki moľnosti %s, ni glave paketa"
+msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa"
#: apt-pkg/policy.cc:368
#, c-format
@@ -2859,69 +2870,69 @@ msgstr "Predpomnilnik ima neustrezen sistem različic"
#: apt-pkg/pkgcachegen.cc:198
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Priąlo je do napake med obdelavo %s (Nov paket)"
+msgstr "Prišlo je do napake med obdelavo %s (Nov paket)"
#: apt-pkg/pkgcachegen.cc:215
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 1)"
+msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 1)"
#: apt-pkg/pkgcachegen.cc:253
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Med obdelovanjem %s je priąlo do napake (NovOpisDatoteke1)"
+msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke1)"
#: apt-pkg/pkgcachegen.cc:285
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 2)"
+msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 2)"
#: apt-pkg/pkgcachegen.cc:289
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Priąlo je do napake med obdelavo %s (Nova različica datoteke 1)"
+msgstr "Prišlo je do napake med obdelavo %s (Nova različica datoteke 1)"
#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
#: apt-pkg/pkgcachegen.cc:324
#, c-format
msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Med obdelovanjem %s je priąlo do napake (NovaRazličica%d)"
+msgstr "Med obdelovanjem %s je prišlo do napake (NovaRazličica%d)"
#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Priąlo je do napake med obdelavo %s (Uporabi paket 3)"
+msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 3)"
#: apt-pkg/pkgcachegen.cc:353
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Med obdelovanjem %s je priąlo do napake (NovOpisDatoteke2)"
+msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke2)"
#: apt-pkg/pkgcachegen.cc:360
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Čestitamo, presegli ste ątevilo imen paketov, ki jih zmore APT."
+msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
#: apt-pkg/pkgcachegen.cc:363
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Čestitamo, presegli ste ątevilo različic, ki jih zmore APT."
+msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
#: apt-pkg/pkgcachegen.cc:366
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Čestitamo, presegli ste ątevilo opisov, ki jih je zmoľen APT."
+msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
#: apt-pkg/pkgcachegen.cc:369
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Čestitamo, presegli ste ątevilo odvisnosti, ki jih zmore APT."
+msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
#: apt-pkg/pkgcachegen.cc:398
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Priąlo je do napake med obdelavo %s (Najdi paket)"
+msgstr "Prišlo je do napake med obdelavo %s (Najdi paket)"
#: apt-pkg/pkgcachegen.cc:412
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Priąlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
+msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
#: apt-pkg/pkgcachegen.cc:418
#, c-format
@@ -2953,7 +2964,7 @@ msgstr "Neujemanje vsote MD5"
#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
#: apt-pkg/acquire-item.cc:1924
msgid "Hash Sum mismatch"
-msgstr "Neujemanje vsote razprąil"
+msgstr "Neujemanje vsote razpršil"
#: apt-pkg/acquire-item.cc:1341
#, c-format
@@ -2961,11 +2972,13 @@ msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
+"sources.list ali slabo oblikovana datoteka)"
#: apt-pkg/acquire-item.cc:1356
-#, fuzzy, c-format
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
+msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
#: apt-pkg/acquire-item.cc:1415
msgid "There is no public key available for the following key IDs:\n"
@@ -2990,8 +3003,8 @@ msgid ""
"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
-"Med preverjanjem podpisa je priąlo do napake. Skladiąče ni posodobljeno. "
-"Uporabljene bodo predhodne datoteke kazala . Napaka GPG: %s: %s\n"
+"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
+"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#: apt-pkg/acquire-item.cc:1515
#, c-format
@@ -3036,12 +3049,12 @@ msgstr "Ni mogoče razčleniti Release datoteke %s"
#: apt-pkg/indexrecords.cc:63
#, c-format
msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s "
+msgstr "Ni izbir v Release datoteki %s"
#: apt-pkg/indexrecords.cc:97
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razprąila v Release datoteki %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
#: apt-pkg/indexrecords.cc:110
#, c-format
@@ -3184,7 +3197,7 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
#: apt-pkg/indexcopy.cc:549
#, c-format
msgid "Hash mismatch for: %s"
-msgstr "Neujemanje razprąila za: %s"
+msgstr "Neujemanje razpršila za: %s"
#: apt-pkg/cacheset.cc:337
#, c-format
@@ -3209,7 +3222,8 @@ msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
+msgstr ""
+"Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
#, c-format
@@ -3217,37 +3231,38 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-"Ni mogoče izbrati nameąčene različice ali različice kandidata iz paketa "
+"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
"'%s', saj nima nobenega od njiju"
#: apt-pkg/cacheset.cc:491
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-"Ni mogoče izbrati najnovejąe različice iz paketa '%s', saj je popolnoma "
-"navidezen "
+"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
+"navidezen"
#: apt-pkg/cacheset.cc:499
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
+msgstr ""
+"Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
-msgstr "Ni mogoče izbrati nameąčene različice iz paketa %s, saj ni nameąčen"
+msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
msgid "Installing %s"
-msgstr "Nameąčanje %s"
+msgstr "Nameščanje %s"
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828
#, c-format
msgid "Configuring %s"
msgstr "Nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835
#, c-format
msgid "Removing %s"
msgstr "Odstranjevanje %s"
@@ -3265,80 +3280,80 @@ msgstr "%s je izginil"
#: apt-pkg/deb/dpkgpm.cc:57
#, c-format
msgid "Running post-installation trigger %s"
-msgstr "Poganjanje sproľilca po namestitvi %s"
+msgstr "Poganjanje sprožilca po namestitvi %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:651
#, c-format
msgid "Directory '%s' missing"
msgstr "Mapa '%s' manjka"
-#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
+#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680
#, c-format
msgid "Could not open file '%s'"
msgstr "Ni mogoče odpreti datoteke '%s'"
-#: apt-pkg/deb/dpkgpm.cc:812
+#: apt-pkg/deb/dpkgpm.cc:821
#, c-format
msgid "Preparing %s"
msgstr "Pripravljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:813
+#: apt-pkg/deb/dpkgpm.cc:822
#, c-format
msgid "Unpacking %s"
-msgstr "Raząirjanje %s"
+msgstr "Razširjanje %s"
-#: apt-pkg/deb/dpkgpm.cc:818
+#: apt-pkg/deb/dpkgpm.cc:827
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravljanje na nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:829
#, c-format
msgid "Installed %s"
-msgstr "%s je bil nameąčen"
+msgstr "%s je bil nameščen"
-#: apt-pkg/deb/dpkgpm.cc:825
+#: apt-pkg/deb/dpkgpm.cc:834
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravljanje na odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc:836
#, c-format
msgid "Removed %s"
msgstr "%s je bil odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:832
+#: apt-pkg/deb/dpkgpm.cc:841
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravljanje na popolno odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:833
+#: apt-pkg/deb/dpkgpm.cc:842
#, c-format
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1039
+#: apt-pkg/deb/dpkgpm.cc:1048
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:1070
+#: apt-pkg/deb/dpkgpm.cc:1079
msgid "Running dpkg"
msgstr "Poganjanje dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1273
+#: apt-pkg/deb/dpkgpm.cc:1282
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"
+"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:1278
+#: apt-pkg/deb/dpkgpm.cc:1287
msgid "dependency problems - leaving unconfigured"
-msgstr "teľave odvisnosti - puąčanje nenastavljenega"
+msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1280
+#: apt-pkg/deb/dpkgpm.cc:1289
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3346,7 +3361,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:1286
+#: apt-pkg/deb/dpkgpm.cc:1295
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3354,7 +3369,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"polnega diska"
-#: apt-pkg/deb/dpkgpm.cc:1292
+#: apt-pkg/deb/dpkgpm.cc:1302
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3362,7 +3377,14 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1299
+#. 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
+#: apt-pkg/deb/dpkgpm.cc:1308
+#, c-format
+msgid "short read in buffer_copy %s"
+msgstr "kratko branje v kopiji_medpomnilnika %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1318
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3375,12 +3397,12 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
-"Skrbniąke mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
+"Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
#: apt-pkg/deb/debsystem.cc:72
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Skrbniąke mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
+msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3388,7 +3410,8 @@ msgstr "Skrbniąke mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'."
+msgstr ""
+"dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
#: apt-pkg/deb/debsystem.cc:106
msgid "Not locked"
@@ -3399,12 +3422,12 @@ msgstr "Ni zaklenjeno"
#: methods/mirror.cc:200
#, c-format
msgid "No mirror file '%s' found "
-msgstr "Datoteke zrcalnih streľnikov '%s' ni mogoče najti"
+msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti "
#: methods/mirror.cc:343
#, c-format
msgid "[Mirror: %s]"
-msgstr "[Zrcalni streľnik: %s]"
+msgstr "[Zrcalni strežnik: %s]"
#: methods/rred.cc:503
#, c-format
@@ -3428,8 +3451,190 @@ msgstr ""
msgid "Connection closed prematurely"
msgstr "Povezava se je prezgodaj zaprla"
-#~ msgid "Error occurred while processing %s (NewVersion2)"
-#~ msgstr "Priąlo je do napake pri obdelavi %s (Nova različica 2)"
-
-#~ msgid "Malformed line %u in source list %s (vendor id)"
-#~ msgstr "Napačna vrstica %u v seznamu virov %s (ID ponudnika)"
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ " apt-cache [options] add file1 [file2 ...]\n"
+#~ " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+#~ " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to manipulate APT's binary\n"
+#~ "cache files, and query information from them\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " add - Add a package file to the source cache\n"
+#~ " gencaches - Build both the package and source cache\n"
+#~ " showpkg - Show some general information for a single package\n"
+#~ " showsrc - Show source records\n"
+#~ " stats - Show some basic statistics\n"
+#~ " dump - Show the entire file in a terse form\n"
+#~ " dumpavail - Print an available file to stdout\n"
+#~ " unmet - Show unmet dependencies\n"
+#~ " search - Search the package list for a regex pattern\n"
+#~ " show - Show a readable record for the package\n"
+#~ " showauto - Display a list of automatically installed packages\n"
+#~ " depends - Show raw dependency information for a package\n"
+#~ " rdepends - Show reverse dependency information for a package\n"
+#~ " pkgnames - List the names of all packages in the system\n"
+#~ " dotty - Generate package graphs for GraphViz\n"
+#~ " xvcg - Generate package graphs for xvcg\n"
+#~ " policy - Show policy settings\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -p=? The package cache.\n"
+#~ " -s=? The source cache.\n"
+#~ " -q Disable progress indicator.\n"
+#~ " -i Show only important deps for the unmet command.\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#~ msgstr ""
+#~ "Uporaba: apt-cache [možnosti] ukaz\n"
+#~ " apt-cache [možnosti] add datoteka1 [datoteka2 ...]\n"
+#~ " apt-cache [možnosti] showpkg paket1 [paket2 ...]\n"
+#~ " apt-cache [možnosti] showsrc paket 1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-cache je orodje nizke ravni, ki se uporablja za upravljanje APT-ovih\n"
+#~ "binarnih datotek predpomnilnika in za poizvedbo podatkov iz njih\n"
+#~ "\n"
+#~ "Ukazi: add - dodat datoteko paketa v predpomnilnik vira\n"
+#~ " gencaches - izgradi tako paket kot izvorni predpomnilnik\n"
+#~ " showpkg - pokaže nekaj splošnih podatkov za posamezen paket\n"
+#~ " showsrc - pokaže zapise vira\n"
+#~ " stats - pokaže nekaj osnovne statistike\n"
+#~ " dump - pokaže celotno datoteko v obliki terse\n"
+#~ " dumpavail - izpiše razpoložljivo datoteko na standardni izhod\n"
+#~ " unmet - pokaže nerazrešene odvisnosti\n"
+#~ " search - išče seznam paketov za vzorec logičnega izraza\n"
+#~ " show - išče berljiv zapis paketa\n"
+#~ " showauto - pokaže seznam samodejno nameščenih paketov\n"
+#~ " depends - pokaže surove podatke odvisnosti za paket\n"
+#~ " rdepends - pokaže obratne podatke odvisnosti za paket\n"
+#~ " pkgnames - našteje imena vseh paketov na sistemu\n"
+#~ " dotty - ustvari grafe paketov za GraphViz\n"
+#~ " xvcg - ustvari grafe paketov za xvcg\n"
+#~ " policy - pokaže nastavitve pravil\n"
+#~ "\n"
+#~ "Možnosti:\n"
+#~ " -h to besedilo pomoči\n"
+#~ " -p=? predpomnilnik paketa\n"
+#~ " -s=? predpomnilnik vira\n"
+#~ " -q onemogoči pokazatelj napredka\n"
+#~ " -i pokaže le pomembne odvisnosti za ukaz unmet.\n"
+#~ " -c=? prebere podano datoteko nastavitev\n"
+#~ " -o=? nastavi poljubno možnost nastavitev, na primer -o dir::cache=/tmp\n"
+#~ "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt-"
+#~ "conf(5).\n"
+
+#~ msgid ""
+#~ "Usage: apt-get [options] command\n"
+#~ " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#~ " apt-get [options] source pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-get is a simple command line interface for downloading and\n"
+#~ "installing packages. The most frequently used commands are update\n"
+#~ "and install.\n"
+#~ "\n"
+#~ "Commands:\n"
+#~ " update - Retrieve new lists of packages\n"
+#~ " upgrade - Perform an upgrade\n"
+#~ " install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#~ " remove - Remove packages\n"
+#~ " autoremove - Remove automatically all unused packages\n"
+#~ " purge - Remove packages and config files\n"
+#~ " source - Download source archives\n"
+#~ " build-dep - Configure build-dependencies for source packages\n"
+#~ " dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#~ " dselect-upgrade - Follow dselect selections\n"
+#~ " clean - Erase downloaded archive files\n"
+#~ " autoclean - Erase old downloaded archive files\n"
+#~ " check - Verify that there are no broken dependencies\n"
+#~ " markauto - Mark the given packages as automatically installed\n"
+#~ " unmarkauto - Mark the given packages as manually installed\n"
+#~ "\n"
+#~ "Options:\n"
+#~ " -h This help text.\n"
+#~ " -q Loggable output - no progress indicator\n"
+#~ " -qq No output except for errors\n"
+#~ " -d Download only - do NOT install or unpack archives\n"
+#~ " -s No-act. Perform ordering simulation\n"
+#~ " -y Assume Yes to all queries and do not prompt\n"
+#~ " -f Attempt to correct a system with broken dependencies in place\n"
+#~ " -m Attempt to continue if archives are unlocatable\n"
+#~ " -u Show a list of upgraded packages as well\n"
+#~ " -b Build the source package after fetching it\n"
+#~ " -V Show verbose version numbers\n"
+#~ " -c=? Read this configuration file\n"
+#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#~ "pages for more information and options.\n"
+#~ " This APT has Super Cow Powers.\n"
+#~ msgstr ""
+#~ "Uporaba: apt-get [možnosti] ukaz\n"
+#~ " apt-get [možnosti] install|remove paket1 [paket2 ...]\n"
+#~ " apt-get [možnosti] source paket1 [paket2 ...]\n"
+#~ "\n"
+#~ "apt-get je enostaven vmesnik ukazne vrstice za prejemanje in\n"
+#~ "nameščanje paketov. Najpogosteje uporabljana ukaza sta update\n"
+#~ "in install.\n"
+#~ "\n"
+#~ "Ukazi:\n"
+#~ " update - pridobi nov seznam paketov\n"
+#~ " upgrade - izvede nadgradnjo install - namesti nove pakete (paket je libc6 "
+#~ "ne libc6.deb)\n"
+#~ " remove - odstrani pakete\n"
+#~ " autoremove - samodejno odstrani vse neuporabljene pakete\n"
+#~ " purge - odstrani pakete in nastavitvene datoteke\n"
+#~ " source - prejme izvorne arhive\n"
+#~ " build-deb - nastavi odvisnosti gradnje za izvorne pakete\n"
+#~ " dist-upgrade - nadgradi distribucijo, oglejte si apt-get(8)\n"
+#~ " dselect-upgrade - sledi naslednjim izbiram\n"
+#~ " clean - izbriše prejete datoteke arhivov\n"
+#~ " markauto - označi dane pakete kot samodejno nameščene\n"
+#~ " unmarkauto - odstrani dane pakete kot ročno nameščene\n"
+#~ "\n"
+#~ "Možnosti:\n"
+#~ " -h to besedilo pomoči\n"
+#~ " -q beležljiv izhod - brez pokazatelja napredka\n"
+#~ " -qq brez izhoda razen za napake\n"
+#~ " -d le prejme - NE namesti ali razpakira arhivov\n"
+#~ " -s izvede simulacijo ukaza.\n"
+#~ " -y predpostavi y za vsa vprašanja in ne sprašuje\n"
+#~ " -f poskuša popraviti sistem s pokvarjenimi odvisnostmi\n"
+#~ " -m poskuša nadaljevati, če arhivov ni mogoče najti\n"
+#~ " -u pokaže tudi seznam nadgrajenih paketov\n"
+#~ " -b izgradi izvorni paket po njegovem pridobivanju\n"
+#~ " -V pokaže podroben izpis števila različice\n"
+#~ " -c=? prebere to nastavitveno datoteko\n"
+#~ " -o=? nastavi poljubno nastavitveno možnost, na primer -0 dir::cache=/tmp\n"
+#~ "Oglejte si strani apt-get(8), sources.list(5) in priročnik apt.conf(5)\n"
+#~ " za več podrobnosti in možnosti.\n"
+#~ " Ta APT ima moči Super Krav.\n"
+
+#, c-format
+#~ msgid ""
+#~ "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+#~ "under APT::Immediate-Configure for details. (%d)"
+#~ msgstr ""
+#~ "Ni mogoče izvesti takojšnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
+#~ "APT::Takojšnja-nastavitev za podrobnosti. (%d)"
+
+#, c-format
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'.Please "
+#~ "see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Ni mogoče izvesti takojšnje nastavitve že razpakiranega '%s'. Oglejte si man "
+#~ "5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"
+
+#~ msgid ""
+#~ "Some index files failed to download, they have been ignored, or old ones "
+#~ "used instead."
+#~ msgstr ""
+#~ "Nekaterih kazal ni mogoče prejeti, zato so prezrta, ali pa so uporabljena "
+#~ "starejša."
+
+#, c-format
+#~ msgid "Can't select versions from package '%s' as it purely virtual"
+#~ msgstr ""
+#~ "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 02:05:44 +0000