diff options
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 55 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/init.h | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 5 | ||||
| -rwxr-xr-x | cmdline/apt-key | 16 | ||||
| -rw-r--r-- | cmdline/makefile | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.conf.changelog | 6 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 12 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/apt.postinst | 5 | ||||
| -rw-r--r-- | debian/changelog | 2114 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | doc/examples/sources.list | 12 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 437 | ||||
| -rw-r--r-- | doc/po/de.po | 904 | ||||
| -rw-r--r-- | doc/po/es.po | 585 | ||||
| -rw-r--r-- | doc/po/fr.po | 622 | ||||
| -rw-r--r-- | doc/po/it.po | 458 | ||||
| -rw-r--r-- | doc/po/ja.po | 588 | ||||
| -rw-r--r-- | doc/po/pl.po | 592 | ||||
| -rw-r--r-- | doc/po/pt.po | 585 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 465 | ||||
| -rw-r--r-- | po/apt-all.pot | 714 | ||||
| -rw-r--r-- | po/makefile | 6 | ||||
| -rw-r--r-- | share/apt-auth-failure.note | 11 | ||||
| -rw-r--r-- | share/ubuntu-archive.gpg | bin | 0 -> 1724 bytes |
29 files changed, 4590 insertions, 3627 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 5fbd1801a..f8758ea0a 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1326,7 +1326,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; @@ -1353,18 +1353,43 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) } // do not report out-of-memory failures - if(strstr(errormsg, strerror(ENOMEM)) != NULL) { + if(strstr(errormsg, strerror(ENOMEM)) != NULL || + strstr(errormsg, "failed to allocate memory") != NULL) { std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl; return; } - // do not report dpkg I/O errors - // XXX - this message is localized, but this only matches the English version. This is better than nothing. - if(strstr(errormsg, "short read in buffer_copy (")) { - std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + // do not report bugs regarding inaccessible local files + if(strstr(errormsg, strerror(ENOENT)) != NULL || + strstr(errormsg, "cannot access archive") != NULL) { + std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl; return; } + // do not report dpkg I/O errors, this is a format string, so we compare + // the prefix and the suffix of the error with the dpkg error message + vector<string> io_errors; + io_errors.push_back(string("failed to read on buffer copy for %s")); + io_errors.push_back(string("failed in write on buffer copy for %s")); + io_errors.push_back(string("short read on buffer copy for %s")); + + for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++) + { + vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%'); + if (list.size() > 1) { + // we need to split %s, VectorizeString only allows char so we need + // to kill the "s" manually + if (list[1].size() > 1) { + list[1].erase(0, 1); + if(strstr(errormsg, list[0].c_str()) && + strstr(errormsg, list[1].c_str())) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } + } + } + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); @@ -1454,6 +1479,24 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) { while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); + fprintf(report, " \n"); + fclose(log); + } + } + + // attach history log it if we have it + string histfile_name = _config->FindFile("Dir::Log::History"); + if (!histfile_name.empty()) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "DpkgHistoryLog:\n"); + log = fopen(histfile_name.c_str(),"r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); fclose(log); } } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index e9fa097aa..5487bc5c5 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -917,6 +917,7 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, 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 31b2d9ccd..c9f954d2d 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$"); // Default cdrom mount point Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/"); 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 845c92026..cb2ec0a2b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -3015,7 +3015,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 e867dae73..82bbfcfe6 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -65,3 +65,5 @@ include $(PROGRAM_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..c4092ff44 --- /dev/null +++ b/debian/apt.conf.changelog @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 69f97a36b..1dfaa04a3 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -434,6 +434,13 @@ fi UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then + # check for a new archive signing key (against the master keyring) + if eval apt-key net-update $XSTDERR; then + debug_echo "apt-key net-update (success)" + else + debug_echo "apt-key net-update (failure)" + fi + # run apt-get update if eval apt-get $XAPTOPT -y update $XSTDERR; then debug_echo "download updated metadata (success)." if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then @@ -447,6 +454,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then fi update_stamp $UPDATE_STAMP UPDATED=1 + # now run apt-xapian-index if it is installed to ensure the index + # is up-to-date + if [ -x /usr/sbin/update-apt-xapian-index ]; then + nice ionice -c3 update-apt-xapian-index -q + 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 7598a139d..5501c097b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.8.15ubuntu1) UNRELEASED; 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> Tue, 28 Jun 2011 22:40:06 +0100 + apt (0.8.15) unstable; urgency=low [ Julian Andres Klode ] @@ -107,6 +118,101 @@ apt (0.8.15) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 28 Jun 2011 18:00:48 +0200 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.changelog: + - add missing ";", thanks to Julian Andres Klode + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - updated allocate memory string + - cannot access archive string is lowercase + * apt-pkg/deb/dpkgpm.cc: + - resolve issue where AptOrdering is included in DpkgTerminalLog in apport + attachments + + -- Brian Murray <brian@ubuntu.com> Wed, 15 Jun 2011 14:00:43 -0700 + +apt (0.8.14.1ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/deblistparser.cc: + - include all known languages when building the apt cache + (LP: #794907) + * apt-pkg/deb/debindexfile.cc: + - remove some no longer valid checks for "TranslationsAvailable()" + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Jun 2011 13:56:25 +0200 + +apt (0.8.14.1ubuntu6) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - prevent reporting of package installation failures due to inaccessible + local files (LP: #791102, #790040) + - include /var/log/apt/history.log in apport-package reports so we know + the context for the package management request + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Jun 2011 15:55:07 +0200 + +apt (0.8.14.1ubuntu5) oneiric; urgency=low + + * apt-pkg/acquire-item.cc: + - do not reject empty Packages files when checking them for + correctness + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 May 2011 10:41:30 +0200 + +apt (0.8.14.1ubuntu4) oneiric; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 May 2011 17:12:27 +0200 + +apt (0.8.14.1ubuntu3) oneiric; urgency=low + + * Rebuild with recent binutils. LP: #774175. + + -- Matthias Klose <doko@ubuntu.com> Mon, 23 May 2011 19:15:34 +0200 + +apt (0.8.14.1ubuntu2) oneiric; urgency=low + + * debian/rules: + - build in verbose mode by default (thanks to Matthias Klose) + * debian/control: + - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 May 2011 13:58:10 +0200 + +apt (0.8.14.1ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid bzr branch + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Apr 2011 17:55:20 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: @@ -149,6 +255,42 @@ apt (0.8.14) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Fri, 15 Apr 2011 14:28:15 +0200 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray <brian@ubuntu.com> Wed, 20 Apr 2011 15:05:12 -0700 + +apt (0.8.13.2ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Apr 2011 12:52:21 +0200 + +apt (0.8.13.2ubuntu1) natty; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] @@ -185,6 +327,12 @@ apt (0.8.13.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200 +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid (LP: #744832) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Apr 2011 14:40:51 +0200 + apt (0.8.13.1) unstable; urgency=low * apt-pkg/acquire-item.cc: Use stat buffer if stat was @@ -192,6 +340,24 @@ apt (0.8.13.1) unstable; urgency=low -- Julian Andres Klode <jak@debian.org> Sat, 02 Apr 2011 20:55:35 +0200 +apt (0.8.13ubuntu2) natty; urgency=low + + * po/makefile: + - add hack to run MSGMERGE again if it segfaults. this is to help + powerpc to bootstrap + * mirror method: + - merge fix from Matt Zimmerman, many thanks (LP: #741098) + - do not crash if the mirror file fails to download + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Mar 2011 18:01:38 +0100 + +apt (0.8.13ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the + apt mirror method + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] @@ -213,6 +379,29 @@ apt (0.8.13) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100 +apt (0.8.12ubuntu2) unstable; urgency=low + + [ Thorsten Spindler ] + * methods/rsh.cc + - fix rsh/ssh option parsing (LP: #678080), thanks to + Ville Mattila + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - mark pkgAcqIndexTrans as Index-File to avoid asking the + user to insert the CD on each apt-get update + * methods/mirror.cc: + - improve debug output and fix bug in TryNextMirror + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100 + +apt (0.8.12ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the udev based + cdrom handling and multiarch handling + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 16:12:22 +0100 + apt (0.8.12) unstable; urgency=low [ Michael Vogt ] @@ -266,6 +455,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 ] @@ -497,6 +703,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 ] @@ -516,6 +743,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 ] @@ -547,6 +816,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 ] @@ -566,6 +876,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 ] @@ -684,6 +1005,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 ] @@ -776,6 +1183,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 ] @@ -818,6 +1288,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 ] @@ -860,6 +1344,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 ] @@ -1474,6 +2008,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 ] @@ -1594,6 +2274,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 ] @@ -1737,6 +2450,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 ] @@ -1806,6 +2542,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 ] @@ -2035,6 +2824,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 ] @@ -2078,6 +2895,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 ] @@ -2146,6 +3082,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 ] @@ -2444,6 +3386,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 ] @@ -2670,6 +3696,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 ] @@ -2795,6 +4083,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 @@ -2822,6 +4297,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 ] @@ -2882,6 +4365,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. @@ -3004,6 +4571,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 @@ -3033,6 +4710,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. @@ -3145,6 +4842,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: @@ -3190,6 +5054,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 @@ -3278,6 +5173,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: @@ -3310,6 +5225,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: @@ -3333,6 +5280,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: @@ -3356,6 +5321,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: @@ -3376,6 +5354,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: @@ -3482,6 +5476,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 @@ -3491,6 +5559,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 @@ -3506,6 +5580,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 @@ -3518,6 +5625,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 6d0f16b70..460c550f0 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,23 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team <deity@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.2 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, gcc-4.6 (>= 4.6.0-6ubuntu2) Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any -Pre-Depends: ${shlibs:Depends} -Depends: debian-archive-keyring, ${misc:Depends}, gnupg +Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} +Recommends: ubuntu-keyring 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 0544b2b8e..93fdbd8da 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. +# build in verbose mode by default to make it easy to diangose issues +export NOISY=1 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -176,6 +179,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 47a7c38d7..1c40d9f7c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\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" @@ -566,7 +566,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 +#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 msgid "Description" msgstr "" @@ -944,7 +944,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -967,7 +967,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +#: 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 "" @@ -987,12 +987,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" @@ -1067,7 +1067,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: " "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> " "e.g. <literal>APT::Cache::ShowRecommends</literal>." @@ -1091,7 +1091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1187,12 +1187,12 @@ msgid "" 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:612 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. 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:628 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 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:661 sources.list.5.xml:234 msgid "See Also" msgstr "" @@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. 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:632 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 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 "" @@ -1311,12 +1311,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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 "" @@ -1519,7 +1519,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2443,28 +2443,26 @@ msgid "" "Configuration Items: " "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " -"where <literal><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or " -"<literal>Release</literal> and " -"<literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or " -"<literal>SHA256</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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:542 +#: 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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -2473,12 +2471,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:556 +#: 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 " @@ -2487,12 +2485,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:564 +#: 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 " @@ -2502,12 +2500,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2515,24 +2513,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:585 +#: 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 " @@ -2541,12 +2539,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:593 +#: 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 " @@ -2560,12 +2558,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:605 +#: 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 " @@ -2575,12 +2573,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2589,14 +2587,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2924,7 +2922,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -3618,34 +3616,20 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -msgid "net-update" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch " -"from. APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3656,42 +3640,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -3699,8 +3683,8 @@ msgstr "" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3719,21 +3703,21 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> " "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " -"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> " +"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> " "</group> <arg choice=\"plain\" " -"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>" +"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg " +"choice=\"plain\">showauto</arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3743,128 +3727,104 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" +#: apt-mark.8.xml:76 +msgid "unmarkauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" +#: apt-mark.8.xml:84 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 +#: apt-mark.8.xml:85 msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg " -"--set-selections</command> and the state is therefore maintained by &dpkg; " -"and not effected by the <option>--filename</option> option." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." +msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 -msgid "showauto" +#: apt-mark.8.xml:97 +msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 +#: apt-mark.8.xml:100 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." +"Read/Write package stats from " +"<filename><replaceable>FILENAME</replaceable></filename> instead of the " +"default location, which is <filename>extended_status</filename> in the " +"directory defined by the Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -msgid "showmanual" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -msgid "showhold" +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 -msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 -msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>" +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 -msgid "" -"Read/Write package stats from " -"<filename><replaceable>FILENAME</replaceable></filename> instead of the " -"default location, which is <filename>extended_status</filename> in the " -"directory defined by the Configuration Item: <literal>Dir::State</literal>." +#: apt-mark.8.xml:116 +msgid "Show the program version." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -4201,10 +4161,10 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" @@ -4912,7 +4872,7 @@ msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " "checked: If this setting exists the method will only be used if this file " -"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder " +"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder " "type=\"literallayout\" id=\"0\"/> Note also that list entries specified on " "the command line will be added at the end of the list specified in the " "configuration files, but before the default entries. To prefer a type in " @@ -4925,7 +4885,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5867,8 +5827,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or " -"\"<literal>pref</literal>\" as filename extension and only contain " +"following naming convention: The files have no or " +"\"<literal>pref</literal>\" as filename extension and which only contain " "alphanumeric, hyphen (-), underscore (_) and period (.) characters. " "Otherwise APT will print a notice that it has ignored a file if the file " "doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> " @@ -6190,133 +6150,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a " -"glob()-like expression) or contains the word kde (as a POSIX extended " -"regular expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, no-wrap -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, no-wrap -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -msgid "Package" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6324,7 +6233,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6333,14 +6242,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -6357,12 +6266,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6372,7 +6281,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6380,7 +6289,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@ -6389,12 +6298,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6402,27 +6311,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@ -6434,12 +6343,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6450,18 +6359,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -6472,13 +6381,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6489,7 +6398,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6498,12 +6407,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6515,18 +6424,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6535,18 +6444,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6555,13 +6464,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6575,7 +6484,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6590,12 +6499,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6603,12 +6512,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6623,7 +6532,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6633,7 +6542,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6642,7 +6551,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6651,13 +6560,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6666,12 +6575,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -6688,7 +6597,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6699,7 +6608,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6708,13 +6617,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6726,12 +6635,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6753,7 +6662,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6768,7 +6677,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6777,13 +6686,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6795,12 +6704,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index dc4d34b81..c75a8dda5 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ # Translation of apt-doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # This file is distributed under the same license as the apt-doc package. -# Chris Leick <c.leick@vollbio.de>, 2009-2011. +# Chris Leick <c.leick@vollbio.de>, 2009, 2010. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.8.14-1\n" +"Project-Id-Version: apt-doc 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2011-06-28 13:40+0300\n" -"PO-Revision-Date: 2011-05-31 21:00+0100\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" +"PO-Revision-Date: 2010-09-16 19:04+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -656,12 +656,16 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +#| "<date>14 February 2004</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 " "February 2011</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " -"<date>04. Februar 2011</date>" +"<date>14. Februar 2004</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cache.8.xml:25 apt-cache.8.xml:32 @@ -686,10 +690,33 @@ msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cache.8.xml:33 msgid "query the APT cache" -msgstr "den APT-Zwischenspeicher abfragen" +msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cache.8.xml:39 +#, fuzzy +#| msgid "" +#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " +#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> " +#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" +#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" +#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" +#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" +#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice=" +#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg " +#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" +#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" +#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>config string</replaceable></option></arg> <arg><option>-" @@ -714,15 +741,16 @@ msgstr "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> " "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group " -"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=" -"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg " -"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> " -"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</" -"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat" -"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice=" -"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " -"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" +"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> " +"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" +"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" +"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" +"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" +"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain" "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " @@ -735,7 +763,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1254,7 +1282,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "Optionen" @@ -1282,7 +1310,7 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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>" @@ -1310,12 +1338,12 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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:546 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>" @@ -1394,18 +1422,12 @@ msgstr "<option>--no-replaces</option>" msgid "<option>--no-enhances</option>" msgstr "<option>--no-enhances</option>" +# FIXME s/twicked/tricked/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be twicked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1436,7 +1458,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1553,14 +1575,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Dateien" @@ -1571,9 +1593,9 @@ 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Siehe auch" @@ -1585,8 +1607,8 @@ 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "Diagnose" @@ -1715,12 +1737,12 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -1974,7 +1996,7 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: 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;" @@ -2287,18 +2309,6 @@ msgid "" "literal>. It then writes to stdout a Release file containing a MD5, SHA1 " "and SHA256 digest for each file." msgstr "" -"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem " -"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene " -"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und " -"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</" -"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert " -"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</" -"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</" -"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, " -"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> " -"aufgeführt werden. Dann schreibt er eine Release-Datei auf die " -"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme " -"enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:125 @@ -3137,39 +3147,46 @@ msgstr "" msgid "" "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" -"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, 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><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." -msgstr "" -"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig " -"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach " -"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: " -"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und " -"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::" -"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal><replaceable>Index</replaceable></" -"literal> <literal>Packages</literal>, <literal>Sources</literal> oder " -"<literal>Release</literal> sein kann und <literal><replaceable>Prüfsumme</replaceable></literal> " -"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</" -"literal> sein kann." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +"<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 "" +"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den " +"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> " +"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die " +"unterstützten Felder sind: <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:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:542 +#: 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>." @@ -3179,7 +3196,7 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3193,12 +3210,12 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: 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:556 +#: 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 " @@ -3212,12 +3229,12 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: 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:564 +#: 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 " @@ -3233,12 +3250,12 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: 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:574 +#: 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</" @@ -3249,12 +3266,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: 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:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3263,12 +3280,12 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: 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:585 +#: 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 " @@ -3282,12 +3299,12 @@ msgstr "" "Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: 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:593 +#: 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 " @@ -3311,12 +3328,12 @@ msgstr "" "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: 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:605 +#: 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 " @@ -3332,19 +3349,19 @@ msgstr "" "werden kann." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3354,7 +3371,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3824,16 +3841,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:281 msgid "download" -msgstr "download" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" -"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle " -"Verzeichnis herunterladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:288 @@ -3898,7 +3913,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 msgid "changelog" -msgstr "changelog" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:313 @@ -3912,14 +3927,6 @@ msgid "" "installed. However, you can specify the same options as for the " "<option>install</option> command." msgstr "" -"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und " -"zeigt es mit <command>sensible-pager</command> an. Der Servername und das " -"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</" -"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</" -"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</" -"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die " -"installierte Version. Sie können jedoch die gleichen Optionen wie für den " -"Befehl <option>install</option> angeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:335 @@ -3937,17 +3944,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:340 +#, fuzzy +#| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" -msgstr "<option>--install-suggests</option>" +msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:341 +#, fuzzy +#| msgid "" +#| "Do not consider recommended packages as a dependency for installing. " +#| "Configuration Item: <literal>APT::Install-Recommends</literal>." msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. " -"Konfigurationselement: <literal>APT::Install-Suggests</literal>." +"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. " +"Konfigurationselement: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:345 @@ -4723,24 +4736,8 @@ msgstr "" "aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die " "nicht länger gültig sind." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4749,12 +4746,12 @@ msgstr "" "Befehlen definiert sein müssen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>Dateiname</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4771,58 +4768,54 @@ msgstr "" "Schlüssel werden zu diesem hinzugefügt." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "" "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. " "August 2009</date>" @@ -4841,22 +4834,13 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain" @@ -4866,7 +4850,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4875,7 +4859,7 @@ msgstr "" "installiert markiert ist." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4891,21 +4875,14 @@ msgstr "" "<command>aptitude</command> entfernt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4914,19 +4891,14 @@ msgstr "" "keine manuell installierten Pakete von ihm abhängen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4935,102 +4907,28 @@ msgstr "" "entfernt wird, wenn kein anderes Paket von ihm abhängt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal> wird benutzt, um eine Liste automatisch " -"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." -msgstr "" -"<literal>showauto</literal> wird benutzt, um eine Liste automatisch " -"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal> wird benutzt, um eine Liste automatisch " "installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5039,7 +4937,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5051,18 +4949,48 @@ msgstr "" "filename> im von Konfigurationselement <literal>Dir::State</literal> " "definierten Verzeichnis, ist." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "Eine kurze Zusammenfassung anzeigen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "Die Programmversion anzeigen." + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5277,6 +5205,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:147 +#, fuzzy +#| msgid "" +#| "In order to add a new key you need to first download it (you should make " +#| "sure you are using a trusted communication channel when retrieving it), " +#| "add it with <command>apt-key</command> and then run <command>apt-get " +#| "update</command> so that apt can download and verify the " +#| "<filename>Release.gpg</filename> files from the archives you have " +#| "configured." msgid "" "In order to add a new key you need to first download it (you should make " "sure you are using a trusted communication channel when retrieving it), add " @@ -5289,9 +5225,8 @@ msgstr "" "(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen " "Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit " "<command>apt-key</command> hinzufügen und dann <command>apt-get update</" -"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> " -"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive " -"herunterladen und prüfen kann." +"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien " +"der von Ihnen konfigurierten Archive herunterladen und prüfen kann." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:156 @@ -5320,14 +5255,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 +#, fuzzy +#| msgid "" +#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -" +#| "abs -o Release.gpg Release</command>." msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --" "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release." "gpg Release</command>." msgstr "" "<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie " -"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -" -"abs -o Release.gpg Release</command> ausführen." +"<command>gpg -abs -o Release.gpg Release</command> ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:172 @@ -5525,27 +5463,20 @@ msgstr "" #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " #| "order which have no or \"<literal>conf</literal>\" as filename extension " #| "and which only contain alphanumeric, hyphen (-), underscore (_) and " -#| "period (.) characters. Otherwise APT will print a notice that it has " -#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::" -#| "Ignore-Files-Silently</literal> configuration list - in this case it will " -#| "be silently ignored." +#| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender " "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als " -"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, " -"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls " -"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die " -"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-" -"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend " -"ignoriert." +"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche " +"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie " +"stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:59 @@ -6585,16 +6516,16 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #| "also that list entries specified on the command line will be added at the " #| "end of the list specified in the configuration files, but before the " #| "default entries. To prefer a type in this case over the ones specified in " -#| "the configuration files you can set the option direct - not in list " +#| "in the configuration files you can set the option direct - not in list " #| "style. This will not override the defined list, it will only prefix the " #| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6604,25 +6535,21 @@ msgstr "" "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung " "existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für " "die (integrierte) bzip2-Methode ist die Einstellung <placeholder type=" -"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile " +"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile " "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den " "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um " -"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei " -"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – " -"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es " -"wird diesen Typ nur vor die Liste setzen." +"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei " +"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im " +"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird " +"diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" -"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um " -"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass " -"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass " -"dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:454 @@ -7058,6 +6985,19 @@ msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:621 +#, fuzzy +#| msgid "" +#| "APT can call dpkg in a way so it can make aggressive use of triggers over " +#| "multiply calls of dpkg. Without further options dpkg will use triggers " +#| "only in between his own run. Activating these options can therefore " +#| "decrease the time needed to perform the install / upgrade. Note that it " +#| "is intended to activate these options per default in the future, but as " +#| "it changes the way APT calling dpkg drastically it needs a lot more " +#| "testing. <emphasis>These options are therefore currently experimental " +#| "and should not be used in productive environments.</emphasis> Also it " +#| "breaks the progress reporting so all frontends will currently stay around " +#| "half (or more) of the time in the 100% state while it actually configures " +#| "all packages." msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7070,18 +7010,17 @@ msgid "" "all frontends will currently stay around half (or more) of the time in the " "100% state while it actually configures all packages." msgstr "" -"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern " -"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird " -"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen " -"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit " -"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft " -"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, " -"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese " -"Optionen sind daher aktuell noch experimentell und sollten nicht in " -"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es " -"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder " -"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete " -"konfiguriert werden." +"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern " +"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg " +"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu " +"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. " +"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu " +"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, " +"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher " +"aktuell noch experimentell und sollten nicht in produktiven Umgebungen " +"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, " +"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem " +"Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> #: apt.conf.5.xml:636 @@ -7907,28 +7846,23 @@ msgstr "" #| "directory are parsed in alphanumeric ascending order and need to obey the " #| "following naming convention: The files have no or \"<literal>pref</" #| "literal>\" as filename extension and which only contain alphanumeric, " -#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will " -#| "print a notice that it has ignored a file if the file doesn't match a " -#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> " -#| "configuration list - in this case it will be silently ignored." +#| "hyphen (-), underscore (_) and period (.) characters - otherwise they " +#| "will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" -"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences." -"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden " -"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder " -"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur " -"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). " -"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert " -"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste " -"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird " +"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in " +"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden " +"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als " +"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche " +"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden " "sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><refsect2><title> @@ -7986,19 +7920,17 @@ msgstr "Priorität 1" #, fuzzy #| msgid "" #| "to the versions coming from archives which in their <filename>Release</" -#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" -#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " -#| "<literal>experimental</literal> archive." +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " "<literal>experimental</literal> archive." msgstr "" -"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</" -"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber " -"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv " -"<literal>experimental</literal> von Debian." +"zu den Versionen, die von Archiven kommen, deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" +"Experimental-Archiv." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:113 @@ -8007,17 +7939,20 @@ msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:114 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." msgid "" "to the version that is already installed (if any) and to the versions coming " "from archives which in their <filename>Release</filename> files are marked " "as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " "backports archive since <literal>squeeze-backports</literal>." msgstr "" -"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu " -"Versionen, die von Archiven kommen, die in deren <filename>Release</" -"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« " -"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-" -"backports</literal>." +"zu den Versionen, die von Archiven kommen, deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" +"Experimental-Archiv." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:121 @@ -8062,10 +7997,9 @@ msgstr "" #| msgid "" #| "If the target release has not been specified then APT simply assigns " #| "priority 100 to all installed package versions and priority 500 to all " -#| "uninstalled package versions, except versions coming from archives which " +#| "uninstalled package versions, expect versions coming from archives which " #| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " -#| "yes\" - these versions get the priority 1 or priority 100 if it is " -#| "additionally marked as \"ButAutomaticUpgrades: yes\"." +#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8077,10 +8011,8 @@ msgstr "" "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " "installierten Paketversionen eine Priorität von 100 und allen nicht " "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen " -"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien " -"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 " -"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« " -"markiert sind." +"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert " +"ist – diese Versionen erhalten die Prirität 1." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:139 @@ -8380,83 +8312,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "Reguläre Ausdrücke und glob()-Syntax" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" -"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären " -"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist " -"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei " -"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder " -"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der " -"von Schrägstrichen umschlossen wird)." - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, no-wrap -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" -"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, " -"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen " -"Paketen von einem Release seit Karmic die Priorität 900 zu." - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, no-wrap -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -msgid "Package" -msgstr "Package" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "*" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8465,12 +8331,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8479,12 +8345,12 @@ msgstr "" "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8494,12 +8360,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8509,12 +8375,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8523,17 +8389,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8544,7 +8410,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8558,7 +8424,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8567,7 +8433,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -8595,12 +8461,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8615,7 +8481,7 @@ msgstr "" "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8626,7 +8492,7 @@ msgstr "" "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8640,12 +8506,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8656,27 +8522,27 @@ msgstr "" "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8697,12 +8563,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8719,18 +8585,18 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8747,13 +8613,13 @@ msgstr "" "anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8769,7 +8635,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8781,12 +8647,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8804,18 +8670,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8827,18 +8693,18 @@ msgstr "" "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8851,13 +8717,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8880,7 +8746,7 @@ msgstr "" "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8906,12 +8772,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8922,12 +8788,12 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8951,7 +8817,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8966,8 +8832,8 @@ msgstr "" "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8979,7 +8845,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8992,13 +8858,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -9012,12 +8878,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -9045,7 +8911,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9062,7 +8928,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9075,13 +8941,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9101,12 +8967,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9141,7 +9007,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9167,7 +9033,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9180,13 +9046,13 @@ msgstr "" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9206,12 +9072,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -9269,6 +9135,14 @@ msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:54 +#, fuzzy +#| msgid "" +#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " +#| "to add sources.list entries in separate files. The format is the same as " +#| "for the regular <filename>sources.list</filename> file. File names need " +#| "to end with <filename>.list</filename> and may only contain letters (a-z " +#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " +#| "characters. Otherwise they will be silently ignored." msgid "" "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " "add sources.list entries in separate files. The format is the same as for " @@ -9284,10 +9158,8 @@ msgstr "" "Das Format ist das gleiche wie für die normale <filename>sources.list</" "filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und " "können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), " -"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen " -"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht " -"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-" -"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert." +"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie " +"stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:65 @@ -9296,6 +9168,17 @@ msgstr "Die Typen deb und deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:66 +#, fuzzy +#| msgid "" +#| "The <literal>deb</literal> type describes a typical two-level Debian " +#| "archive, <filename>distribution/component</filename>. Typically, " +#| "<literal>distribution</literal> is generally one of <literal>stable</" +#| "literal> <literal>unstable</literal> or <literal>testing</literal> while " +#| "component is one of <literal>main</literal> <literal>contrib</literal> " +#| "<literal>non-free</literal> or <literal>non-us</literal>. The " +#| "<literal>deb-src</literal> type describes a debian distribution's source " +#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-" +#| "src</literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -9310,14 +9193,14 @@ msgid "" msgstr "" "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</" -"literal> ist typischerweise ein Archivname wie <literal>stable</literal> " -"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-" -"codename;</literal> oder <literal>&testing-codename;</literal> während " -"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder " -"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ " -"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " -"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird " -"benötigt, um Quellindizes herunterzuladen." +"literal> ist typischerweise entweder <literal>stable</literal>, " +"<literal>unstable</literal> oder <literal>testing</literal>, während " +"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, " +"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der " +"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-" +"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine " +"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes " +"herunterzuladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 @@ -9670,12 +9553,22 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:230 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" -msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:223 +#, fuzzy +#| msgid "" +#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" +#| "US directory, and uses only files found under <filename>unstable/binary-" +#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</" +#| "filename> on m68k, and so forth for other supported architectures. [Note " +#| "this example only illustrates how to use the substitution variable; non-" +#| "us is no longer structured like this] <placeholder type=\"literallayout\" " +#| "id=\"0\"/>" msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -9685,14 +9578,14 @@ msgid "" "archives are not structured like this] <placeholder type=\"literallayout\" " "id=\"0\"/>" msgstr "" -"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-" +"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-" "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter " "<filename>unstable/binary-i386</filename> auf i386-Maschinen, " -"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für " -"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass " -"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt " -"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder " -"type=\"literallayout\" id=\"0\"/>" +"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere " +"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses " +"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. " +"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout" +"\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:235 @@ -11265,27 +11158,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." #~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</" #~ "literal>" -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -#~ msgid "Show a short usage summary." -#~ msgstr "Eine kurze Zusammenfassung anzeigen." - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -#~ msgid "Show the program version." -#~ msgstr "Die Programmversion anzeigen." - #~ msgid "to the version that is already installed (if any)." #~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." diff --git a/doc/po/es.po b/doc/po/es.po index c8fdc9fed..a9317f4eb 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -810,7 +810,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1327,7 +1327,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "Opciones" @@ -1354,7 +1354,7 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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>" @@ -1380,12 +1380,12 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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:546 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>" @@ -1466,16 +1466,9 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be twicked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1507,7 +1500,7 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1624,14 +1617,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Ficheros" @@ -1642,9 +1635,9 @@ 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Véase también" @@ -1656,8 +1649,8 @@ 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "Diagnósticos" @@ -1786,12 +1779,12 @@ msgstr "" "option>. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -2048,7 +2041,7 @@ msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: 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;" @@ -3205,25 +3198,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, 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><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" +"Los valores para los campos de metadatos adicionales en el fichero «Release» " +"se toman de las variables correspondientes en <literal>APT::FTPArchive::" +"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" +"literal>. Los campos permitidos son: <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> y <literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: 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:542 +#: 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>." @@ -3232,7 +3243,7 @@ msgstr "" "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3246,12 +3257,12 @@ msgstr "" "configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: 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:556 +#: 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 " @@ -3264,12 +3275,12 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: 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:564 +#: 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 " @@ -3286,12 +3297,12 @@ msgstr "" "Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: 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:574 +#: 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</" @@ -3302,12 +3313,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: 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:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3316,12 +3327,12 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: 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:585 +#: 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 " @@ -3335,12 +3346,12 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: 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:593 +#: 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 " @@ -3364,12 +3375,12 @@ msgstr "" "comprobaciones adicionales son innecesarias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: 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:605 +#: 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 " @@ -3385,19 +3396,19 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3406,7 +3417,7 @@ msgstr "" "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3879,7 +3890,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4760,24 +4771,8 @@ msgstr "" "Actualiza el registro de claves local con el registro de claves del archivo " "Debian, y elimina del registro las claves del archivo que ya no son válidas." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4786,12 +4781,12 @@ msgstr "" "descritas en el sección anterior." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4808,57 +4803,53 @@ msgstr "" "esto es, por ejemplo, que las claves nuevas se añaden a este fichero." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de " "Agosto de 2009</date>" @@ -4875,22 +4866,13 @@ msgstr "Marca o desmarca un paquete como instalado automáticamente" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice=" @@ -4900,7 +4882,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4909,7 +4891,7 @@ msgstr "" "o no." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4925,21 +4907,14 @@ msgstr "" "eliminará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4948,19 +4923,14 @@ msgstr "" "paquete instalado manualmente dependa de este paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4969,95 +4939,21 @@ msgstr "" "ningún otro depende de él." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal> se usa para mostrar una lista de paquetes " -"instalados automáticamente, un paquete por lÃnea." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal> se usa para mostrar una lista de paquetes " "instalados automáticamente, un paquete por lÃnea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." -msgstr "" -"<literal>showauto</literal> se usa para mostrar una lista de paquetes " -"instalados automáticamente, un paquete por lÃnea." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -5065,7 +4961,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5074,7 +4970,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5087,18 +4983,48 @@ msgstr "" "en el directorio definido en la opción de configuración: <literal>Dir::" "State</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "Muestra un breve resumen de uso." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "Muestra la versión del programa." + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5571,12 +5497,11 @@ msgstr "" #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden " "alfanumérico ascendente que no tienen extensión o la extensión " @@ -6605,9 +6530,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6629,7 +6554,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7922,8 +7847,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8381,84 +8306,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -#, fuzzy -#| msgid "Packages" -msgid "Package" -msgstr "Packages" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8467,12 +8325,12 @@ msgstr "" "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8481,12 +8339,12 @@ msgstr "" "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8496,12 +8354,12 @@ msgstr "" "más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8510,12 +8368,12 @@ msgstr "" "perteneciente a otra distribución, o si la versión instalada es más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8523,17 +8381,17 @@ msgstr "" "La versión sólo se instala si no hay ninguna versión del paquete instalada." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "Evita la instalación de la versión." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8544,7 +8402,7 @@ msgstr "" "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8558,7 +8416,7 @@ msgstr "" "versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8567,7 +8425,7 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -8595,12 +8453,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Por ello:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8615,7 +8473,7 @@ msgstr "" "la versión 5.8*, desactualizando el paquete." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8626,7 +8484,7 @@ msgstr "" "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8639,12 +8497,12 @@ msgstr "" "hay ninguna versión del paquete ya instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinar la versión del paquete y las propiedades de la distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8655,27 +8513,27 @@ msgstr "" "describen los paquetes disponibles en cada uno de los sitios." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "La lÃnea <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "indica el nombre del paquete." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "La lÃnea <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "indica el número de versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8696,12 +8554,12 @@ msgstr "" "de APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "Las lÃneas <literal>Archive:</literal> o <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8719,18 +8577,18 @@ msgstr "" "lÃnea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "La lÃnea <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8749,13 +8607,13 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8771,7 +8629,7 @@ msgstr "" "siguientes lÃnea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8783,12 +8641,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "La lÃnea <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8807,18 +8665,18 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "La lÃnea <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8831,18 +8689,18 @@ msgstr "" "mediante la siguiente lÃnea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "La lÃnea <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8855,13 +8713,13 @@ msgstr "" "siguiente lÃnea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8884,7 +8742,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8909,12 +8767,12 @@ msgstr "" "la distribución «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "LÃneas opcionales en el registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8925,12 +8783,12 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Seguir la distribución «stable» (estable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8954,7 +8812,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8969,8 +8827,8 @@ msgstr "" "<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8982,7 +8840,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8996,13 +8854,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -9015,12 +8873,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -9048,7 +8906,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9065,7 +8923,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9078,13 +8936,13 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9103,12 +8961,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Seguir la evolución de una publicación por el nombre" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9142,7 +9000,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9169,7 +9027,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9183,13 +9041,13 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9208,12 +9066,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11250,27 +11108,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos." #~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" #~ "FTPArchive::MD5</literal>" -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -#~ msgid "Show a short usage summary." -#~ msgstr "Muestra un breve resumen de uso." - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -#~ msgid "Show the program version." -#~ msgstr "Muestra la versión del programa." - #~ msgid "to the version that is already installed (if any)." #~ msgstr "a la versión instalada (de existir)." diff --git a/doc/po/fr.po b/doc/po/fr.po index 6e3977c43..988828235 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-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\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" @@ -731,7 +731,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1250,7 +1250,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "options" @@ -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:572 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:546 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:546 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>" @@ -1391,16 +1391,9 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be twicked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1432,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:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1552,14 +1545,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Fichiers" @@ -1570,9 +1563,9 @@ 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Voir aussi" @@ -1584,8 +1577,8 @@ 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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" @@ -1714,12 +1707,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -1976,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:629 +#: 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;" @@ -3133,25 +3126,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, 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><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" +"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:540 +#: 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:542 +#: 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>." @@ -3161,7 +3172,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3176,12 +3187,12 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: 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:556 +#: 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 " @@ -3195,12 +3206,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: 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:564 +#: 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 " @@ -3216,12 +3227,12 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: 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:574 +#: 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</" @@ -3232,12 +3243,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: 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:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3246,12 +3257,12 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: 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:585 +#: 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 " @@ -3265,12 +3276,12 @@ msgstr "" "<literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: 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:593 +#: 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 " @@ -3293,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:603 +#: 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:605 +#: 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 " @@ -3314,19 +3325,19 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3335,7 +3346,7 @@ msgstr "" "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3811,7 +3822,7 @@ msgstr "download" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" "<literal>download</literal> télécharge le fichier binaire indiqué dans le " "répertoire courant." @@ -4698,24 +4709,8 @@ msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive Debian et supprimer les clés qui y sont périmées." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4724,12 +4719,12 @@ msgstr "" "décrites dans la section suivante." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4746,57 +4741,53 @@ msgstr "" "les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "août 2009</date>" @@ -4813,22 +4804,13 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> " @@ -4838,7 +4820,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4847,7 +4829,7 @@ msgstr "" "a été automatiquement installé ou pas." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4863,21 +4845,14 @@ msgstr "" "command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4886,19 +4861,14 @@ msgstr "" "que plus aucun paquet installé manuellement ne dépend de lui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4907,102 +4877,28 @@ msgstr "" "aucun autre paquet n'en dépend." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal>, affiche les paquets installés automatiquement, " -"un paquet par ligne." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." -msgstr "" -"<literal>showauto</literal>, affiche les paquets installés automatiquement, " -"un paquet par ligne." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal>, affiche les paquets installés automatiquement, " "un paquet par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5011,7 +4907,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5023,18 +4919,48 @@ msgstr "" "par défaut (<filename>extended_status</filename> dans le répertoire défini " "par l'élément de configuration <literal>Dir::State</literal>)." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "Affiche un résumé de l'aide" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "Affiche la version du programme." + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5486,23 +5412,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -#| "order which have no or \"<literal>conf</literal>\" as filename extension " -#| "and which only contain alphanumeric, hyphen (-), underscore (_) and " -#| "period (.) characters. Otherwise APT will print a notice that it has " -#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::" -#| "Ignore-Files-Silently</literal> configuration list - in this case it will " -#| "be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre " "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>" @@ -6538,25 +6454,13 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:442 -#, fuzzy -#| msgid "" -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" -#| "replaceable></literal> will be checked: If this setting exists the method " -#| "will only be used if this file exists, e.g. for the bzip2 method (the " -#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note " -#| "also that list entries specified on the command line will be added at the " -#| "end of the list specified in the configuration files, but before the " -#| "default entries. To prefer a type in this case over the ones specified in " -#| "the configuration files you can set the option direct - not in list " -#| "style. This will not override the defined list, it will only prefix the " -#| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6578,7 +6482,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" "Le type spécial <literal>uncompressed</literal> peut servir à donner la " @@ -7866,21 +7770,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:70 -#, fuzzy -#| msgid "" -#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> " -#| "directory are parsed in alphanumeric ascending order and need to obey the " -#| "following naming convention: The files have no or \"<literal>pref</" -#| "literal>\" as filename extension and which only contain alphanumeric, " -#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will " -#| "print a notice that it has ignored a file if the file doesn't match a " -#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> " -#| "configuration list - in this case it will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8336,84 +8230,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -#, fuzzy -#| msgid "Packages" -msgid "Package" -msgstr "Packages" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8422,12 +8249,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8437,12 +8264,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8451,12 +8278,12 @@ msgstr "" "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8465,29 +8292,29 @@ msgstr "" "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8498,7 +8325,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8512,7 +8339,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8521,7 +8348,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -8549,12 +8376,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8568,7 +8395,7 @@ msgstr "" "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8579,7 +8406,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8592,13 +8419,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8609,27 +8436,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8650,12 +8477,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8672,18 +8499,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8701,13 +8528,13 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8723,7 +8550,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8735,12 +8562,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8758,18 +8585,18 @@ msgstr "" "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8782,18 +8609,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8806,13 +8633,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8836,7 +8663,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8861,12 +8688,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8877,12 +8704,12 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8906,7 +8733,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8921,8 +8748,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8934,7 +8761,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8947,13 +8774,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8966,12 +8793,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -8999,7 +8826,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9016,7 +8843,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9029,13 +8856,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9054,12 +8881,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9093,7 +8920,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9117,7 +8944,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9130,13 +8957,13 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9155,12 +8982,12 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11206,6 +11033,9 @@ 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 "to the version that is already installed (if any)." +#~ msgstr "est affectée à la version déjà installée (si elle existe)." + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" @@ -11219,30 +11049,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::" #~ "FTPArchive::MD5</literal>." -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -#~ msgid "Show a short usage summary." -#~ msgstr "Affiche un résumé de l'aide" - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -#~ msgid "Show the program version." -#~ msgstr "Affiche la version du programme." - -#~ msgid "to the version that is already installed (if any)." -#~ msgstr "est affectée à la version déjà installée (si elle existe)." - #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Gestionnaire de paquets APT - manipulation du cache" diff --git a/doc/po/it.po b/doc/po/it.po index 514e24442..0735044dd 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -532,7 +532,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -910,7 +910,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -934,7 +934,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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 "" @@ -955,12 +955,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" @@ -1035,7 +1035,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1059,7 +1059,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1155,14 +1155,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@ -1173,9 +1173,9 @@ msgstr "" #. 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "" @@ -1187,8 +1187,8 @@ msgstr "" #. 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "" @@ -1287,12 +1287,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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 "" @@ -1496,7 +1496,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2419,26 +2419,26 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " -"<literal><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:542 +#: 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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -2447,12 +2447,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:556 +#: 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 " @@ -2461,12 +2461,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:564 +#: 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 " @@ -2476,12 +2476,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:574 +#: 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</" @@ -2489,24 +2489,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:585 +#: 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 " @@ -2515,12 +2515,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:593 +#: 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 " @@ -2534,12 +2534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:605 +#: 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 " @@ -2549,26 +2549,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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 "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2897,7 +2897,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -3586,35 +3586,20 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -msgid "net-update" -msgstr "upgrade" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3625,43 +3610,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -3669,8 +3654,8 @@ msgstr "" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3689,21 +3674,20 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3713,131 +3697,107 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" +#: apt-mark.8.xml:76 +msgid "unmarkauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" +#: apt-mark.8.xml:84 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 +#: apt-mark.8.xml:85 msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 -msgid "showauto" +#: apt-mark.8.xml:97 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 +#: apt-mark.8.xml:100 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -msgid "showmanual" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -msgid "showhold" +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 -msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 -msgid "" -"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" -"option>" +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 -msgid "" -"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" -"filename> instead of the default location, which is " -"<filename>extended_status</filename> in the directory defined by the " -"Configuration Item: <literal>Dir::State</literal>." +#: apt-mark.8.xml:116 +msgid "Show the program version." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -4174,12 +4134,11 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -4877,9 +4836,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -4890,7 +4849,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5831,8 +5790,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -6150,133 +6109,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, no-wrap -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, no-wrap -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -msgid "Package" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6284,7 +6192,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6293,14 +6201,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -6317,12 +6225,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6332,7 +6240,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6340,7 +6248,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6349,12 +6257,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6362,27 +6270,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6395,12 +6303,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6411,18 +6319,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -6433,13 +6341,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6449,7 +6357,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6458,12 +6366,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6474,18 +6382,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6494,18 +6402,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6514,13 +6422,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6534,7 +6442,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6549,12 +6457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6562,12 +6470,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6582,7 +6490,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6592,8 +6500,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6602,7 +6510,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6611,13 +6519,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6626,12 +6534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -6648,7 +6556,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6659,7 +6567,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6668,13 +6576,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6686,12 +6594,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6711,7 +6619,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6726,7 +6634,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6735,13 +6643,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6753,12 +6661,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 8a75af980..0f88e5e85 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -792,7 +792,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1329,7 +1329,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "オプション" @@ -1357,7 +1357,7 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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>" @@ -1384,12 +1384,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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:546 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>" @@ -1475,7 +1475,7 @@ msgstr "<option>--no-enhances</option>" #, fuzzy msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1505,7 +1505,7 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1627,15 +1627,15 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "ファイル" @@ -1647,9 +1647,9 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "é–¢é€£é …ç›®" @@ -1663,8 +1663,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "診æ–メッセージ" @@ -1800,12 +1800,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -2075,7 +2075,7 @@ msgstr "è¨å®šç®‡æ‰€ã®å†…容を表示ã™ã‚‹ã ã‘ã§ã™ã€‚" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: 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;" @@ -3292,26 +3292,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, 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><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" +"Release ファイルã®è¿½åŠ メタデータフィールドã®å€¤ã¯ã€<literal>APT::FTPArchive::" +"Release</literal> 以下ã®ç›¸å½“ã™ã‚‹å€¤ (例: <literal>APT::FTPArchive::Release::" +"Origin</literal>) ã‚’ã¨ã‚Šã¾ã™ã€‚サãƒãƒ¼ãƒˆã™ã‚‹ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã€<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:540 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:542 +#: 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>." @@ -3321,7 +3338,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3334,13 +3351,13 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:556 +#: 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 " @@ -3353,13 +3370,13 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:564 +#: 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 " @@ -3374,13 +3391,13 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:574 +#: 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</" @@ -3390,13 +3407,13 @@ msgstr "" "é¸æŠžã—ã¾ã™ã€‚è¨å®šé …ç›® - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3405,13 +3422,13 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:585 +#: apt-ftparchive.1.xml:584 #, fuzzy msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " @@ -3425,12 +3442,12 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:593 +#: 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 " @@ -3444,12 +3461,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: 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:605 +#: apt-ftparchive.1.xml:604 #, fuzzy msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " @@ -3465,14 +3482,14 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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 "" @@ -3481,7 +3498,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3491,7 +3508,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3967,7 +3984,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4867,24 +4884,8 @@ msgstr "" "Debian アーカイブã‚ーã§ã€ãƒãƒ¼ã‚«ãƒ«ã‚ーリングを更新ã—ã€ã‚‚ã†æœ‰åŠ¹ã§ãªã„ã‚ーをã‚ー" "リングã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4894,12 +4895,12 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>filename</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4915,35 +4916,35 @@ msgstr "" "åŠ ã•ã‚Œã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "アーカイブã‚ーã®ãƒãƒ¼ã‚«ãƒ«ä¿¡é ¼ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã§ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "Debian ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ä¿¡é ¼ã‚ーã®ã‚ーリングã§ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" @@ -4951,26 +4952,22 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "削除ã•ã‚ŒãŸ Debian ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ä¿¡é ¼ã‚ーã®ã‚ーリングã§ã™ã€‚" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" @@ -4990,22 +4987,13 @@ msgstr "パッケージãŒè‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸã‹ã©ã†ã‹ã® # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" @@ -5016,7 +5004,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -5026,7 +5014,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -5041,22 +5029,15 @@ msgstr "" "command> ã‚„ <command>aptitude</command> ã«ã‚ˆã‚Šå‰Šé™¤ã•ã‚Œã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -5065,20 +5046,15 @@ msgstr "" "ãªããªã‚‹ã¨ã€ã“ã®ãƒ‘ッケージを削除ã—ã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -5087,105 +5063,29 @@ msgstr "" "ケージを自動的ã«å‰Šé™¤ã™ã‚‹ã®ã‚’防ãŽã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ" -"ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ" "ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." -msgstr "" -"<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ" -"ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5195,7 +5095,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5206,20 +5106,52 @@ msgstr "" "トリ㮠<filename>extended_status</filename>) ã«ä»£ãˆã¦ã€<filename>FILENAME</" "filename> ã‹ã‚‰ãƒ‘ッケージã®çµ±è¨ˆã‚’èªã¿æ›¸ãã—ã¾ã™ã€‚" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "çŸã„使用方法を表示ã—ã¾ã™ã€‚" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "プãƒã‚°ãƒ©ãƒ ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™" + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr " &file-extended_states;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5713,12 +5645,11 @@ msgstr "<envar>APT_CONFIG</envar> 環境変数ã§æŒ‡å®šã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (å˜åœ #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" "<literal>Dir::Etc::Parts</literal> ã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’英数å—ã®æ˜‡é †ã«ã€‚" "ファイルåã«ã¯æ‹¡å¼µåãŒãªã„ã‹ã€\"<literal>conf</literal>\" ã¨ãªã£ã¦ãŠã‚Šã€è‹±æ•°" @@ -6713,9 +6644,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6735,7 +6666,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7871,8 +7802,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8326,92 +8257,20 @@ msgstr "" "Pin-Priority: 500\n" "\n" -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" -"\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" -"\n" - -# type: <tag></tag> -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -#, fuzzy -#| msgid "Packages" -msgid "Package" -msgstr "Packages" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "APT ãŒå„ªå…ˆåº¦ã«å‰²ã‚Šè¾¼ã‚€æ–¹æ³•" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8419,13 +8278,13 @@ msgstr "" "パッケージãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8434,13 +8293,13 @@ msgstr "" "å«ã¾ã‚Œãªãã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8449,13 +8308,13 @@ msgstr "" "ジョンã®æ–¹ãŒæ–°ã—ã„ã®ã§ãªã‘ã‚Œã°ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8465,13 +8324,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8480,19 +8339,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ç¦æ¢" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8504,7 +8363,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8518,7 +8377,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8528,7 +8387,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -8558,13 +8417,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "ã™ã‚‹ã¨ã€ä»¥ä¸‹ã®ã‚ˆã†ã«å‹•ä½œã—ã¾ã™ã€‚" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8579,7 +8438,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8591,7 +8450,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8605,13 +8464,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションプãƒãƒ‘ティã®æ±ºå®š" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8622,30 +8481,30 @@ msgstr "" "filename> ファイルをæä¾›ã—ã¾ã™ã€‚" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "パッケージå" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "ãã®åå‰ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8665,13 +8524,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8688,19 +8547,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8718,14 +8577,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8741,7 +8600,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8754,13 +8613,13 @@ msgstr "" "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8778,19 +8637,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8803,7 +8662,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -8811,13 +8670,13 @@ msgstr "" "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> è¡Œ" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8830,7 +8689,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -8839,7 +8698,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8863,7 +8722,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8889,13 +8748,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "APT è¨å®šãƒ¬ã‚³ãƒ¼ãƒ‰ã®ã‚ªãƒ—ション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8906,13 +8765,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "安定版ã®è¿½è·¡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8938,7 +8797,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8954,8 +8813,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8968,7 +8827,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8981,14 +8840,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -9002,13 +8861,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "テスト版やä¸å®‰å®šç‰ˆã®è¿½è·¡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -9037,7 +8896,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9055,7 +8914,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9068,14 +8927,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9094,13 +8953,13 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "コードåリリースã®é€²åŒ–ã®è¿½è·¡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9134,7 +8993,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9158,7 +9017,7 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9171,14 +9030,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9198,13 +9057,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10921,29 +10780,6 @@ msgstr "ã“ã‚Œã§ã€disc ã«ã‚ã‚‹å–得済ã¿ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を使用ã™ã‚‹ã #~ "ンデックスファイル㫠MD5Sum フィールドãŒã‚ã‚Šã¾ã›ã‚“。è¨å®šé …ç›® - " #~ "<literal>APT::FTPArchive::MD5</literal>" -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#~ msgid "Show a short usage summary." -#~ msgstr "çŸã„使用方法を表示ã—ã¾ã™ã€‚" - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#~ msgid "Show the program version." -#~ msgstr "プãƒã‚°ãƒ©ãƒ ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™" - # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #~ msgid "to the version that is already installed (if any)." #~ msgstr "(ã‚ã‚‹ãªã‚‰ã°) æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚" diff --git a/doc/po/pl.po b/doc/po/pl.po index b74746ffc..83615be50 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -788,7 +788,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1335,7 +1335,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "opcje" @@ -1363,7 +1363,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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>" @@ -1391,12 +1391,12 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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:546 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>" @@ -1503,7 +1503,7 @@ msgstr "<option>--no-act</option>" #| "<literal>APT::Cache::RecurseDepends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1534,7 +1534,7 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1660,14 +1660,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Pliki" @@ -1678,9 +1678,9 @@ 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Zobacz także" @@ -1693,8 +1693,8 @@ 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "Diagnostyka" @@ -1837,12 +1837,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -2105,7 +2105,7 @@ msgid "Just show the contents of the configuration space." msgstr "WyÅ›wietla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: 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;" @@ -3106,20 +3106,20 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " -"<literal><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: 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:542 +#: apt-ftparchive.1.xml:541 #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@ -3130,7 +3130,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3144,13 +3144,13 @@ msgstr "" "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: 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:556 +#: apt-ftparchive.1.xml:555 #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@ -3164,12 +3164,12 @@ msgstr "" "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: 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:564 +#: 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 " @@ -3179,13 +3179,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: 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:574 +#: apt-ftparchive.1.xml:573 #, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " @@ -3197,13 +3197,13 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: 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:580 +#: apt-ftparchive.1.xml:579 #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@ -3213,14 +3213,14 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:583 #, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:585 +#: apt-ftparchive.1.xml:584 #, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" @@ -3240,13 +3240,13 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: apt-ftparchive.1.xml:590 #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:593 +#: 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 " @@ -3260,13 +3260,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: apt-ftparchive.1.xml:602 #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:605 +#: 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 " @@ -3276,19 +3276,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "PrzykÅ‚ady" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3296,7 +3296,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3833,7 +3833,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" # @@ -4753,24 +4753,8 @@ msgstr "" "Aktualizuje lokalnÄ… skÅ‚adnicÄ™ kluczy używajÄ…c skÅ‚adnicy kluczy archiwum " "Debiana i usuwa z lokalnej skÅ‚adnicy nieaktualne już klucze archiwów Debiana." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4779,12 +4763,12 @@ msgstr "" "opisanymi w poprzednim rozdziale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nazwa_pliku</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4800,57 +4784,53 @@ msgstr "" "kluczy, co oznacza na przykÅ‚ad to, że nowe klucze bÄ™dÄ… dodawane wÅ‚aÅ›nie tam." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "Lokalna skÅ‚adnica zaufanych kluczy archiwum." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "SkÅ‚adnica zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "SkÅ‚adnica usuniÄ™tych zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; " "<date>9 sierpnia 2009</date>" @@ -4867,22 +4847,13 @@ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain" @@ -4892,7 +4863,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4901,7 +4872,7 @@ msgstr "" "zainstalowany automatycznie." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4917,21 +4888,14 @@ msgstr "" "get</command> lub <command>aptitude</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4940,19 +4904,14 @@ msgstr "" "żaden inny rÄ™cznie zainstalowany pakiet nie bÄ™dzie od niego zależaÅ‚." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4961,98 +4920,22 @@ msgstr "" "sytuacji gdy żaden inny pakiet nie bÄ™dzie od niego zależaÅ‚." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal> jest używane do wypisania listy wszystkich " -"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " -"osobnej linii." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." -msgstr "" -"<literal>showauto</literal> jest używane do wypisania listy wszystkich " -"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " -"osobnej linii." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal> jest używane do wypisania listy wszystkich " "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " "osobnej linii." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -5060,7 +4943,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5069,7 +4952,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5081,19 +4964,51 @@ msgstr "" "domyÅ›lny plik <filename>extended_status</filename> znajdujÄ…cy siÄ™ w katalogu " "okreÅ›lonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +# +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "WyÅ›wietla krótkie informacje na temat użytkowania." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +# +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "WyÅ›wietla wersjÄ™ programu." + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" # #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5456,29 +5371,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " -#| "to add sources.list entries in separate files. The format is the same as " -#| "for the regular <filename>sources.list</filename> file. File names need " -#| "to end with <filename>.list</filename> and may only contain letters (a-z " -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " -#| "characters. Otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" -"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie " -"pliku źródeÅ‚ na osobne pliki. Format jest dokÅ‚adnie taki sam, jak w " -"przypadku zwykÅ‚ego pliku <filename>sources.list</filename>. Nazwy plików w " -"tym katalogu muszÄ… siÄ™ koÅ„czyć rozszerzeniem <filename>.list</filename> i " -"mogÄ… skÅ‚adać siÄ™ tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreÅ›lenia " -"(_), pauzy (-) i kropki (.). Inne pliki zostanÄ… zignorowane." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:59 @@ -6183,9 +6083,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6196,7 +6096,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7152,30 +7052,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:70 -#, fuzzy -#| msgid "" -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " -#| "to add sources.list entries in separate files. The format is the same as " -#| "for the regular <filename>sources.list</filename> file. File names need " -#| "to end with <filename>.list</filename> and may only contain letters (a-z " -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " -#| "characters. Otherwise they will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" -"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie " -"pliku źródeÅ‚ na osobne pliki. Format jest dokÅ‚adnie taki sam, jak w " -"przypadku zwykÅ‚ego pliku <filename>sources.list</filename>. Nazwy plików w " -"tym katalogu muszÄ… siÄ™ koÅ„czyć rozszerzeniem <filename>.list</filename> i " -"mogÄ… skÅ‚adać siÄ™ tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreÅ›lenia " -"(_), pauzy (-) i kropki (.). Inne pliki zostanÄ… zignorowane." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:79 @@ -7516,82 +7402,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -msgid "Package" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -7601,12 +7422,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -7616,12 +7437,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7631,12 +7452,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7646,12 +7467,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -7660,17 +7481,17 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -7678,7 +7499,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -7687,14 +7508,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -7722,12 +7543,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Wtedy:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -7737,7 +7558,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -7745,7 +7566,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -7754,12 +7575,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -7767,27 +7588,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "linia <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "podaje nazwÄ™ pakietu" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "linia <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "podaje numer wersji danego pakietu" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -7800,12 +7621,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -7816,18 +7637,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "linia <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -7838,14 +7659,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, fuzzy, no-wrap #| msgid "Pin: release a=stable\n" msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -7855,7 +7676,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -7867,12 +7688,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "linia <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -7883,18 +7704,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "linia <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -7903,18 +7724,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "linia <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -7923,13 +7744,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -7943,7 +7764,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -7958,12 +7779,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -7971,12 +7792,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8000,7 +7821,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8010,8 +7831,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8023,7 +7844,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8032,13 +7853,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8047,12 +7868,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -8080,7 +7901,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8091,7 +7912,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8100,13 +7921,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8118,12 +7939,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8157,7 +7978,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8172,7 +7993,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8181,13 +8002,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -8199,12 +8020,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10249,29 +10070,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku." #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -# -#~ msgid "Show a short usage summary." -#~ msgstr "WyÅ›wietla krótkie informacje na temat użytkowania." - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -# -#~ msgid "Show the program version." -#~ msgstr "WyÅ›wietla wersjÄ™ programu." - # #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "NarzÄ™dzie zarzÄ…dzania pakietami APT -- manipulator bufora" diff --git a/doc/po/pt.po b/doc/po/pt.po index 6fd27a5c3..93d7ad3af 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -763,7 +763,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1279,7 +1279,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "opções" @@ -1306,7 +1306,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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>" @@ -1332,12 +1332,12 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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:546 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>" @@ -1418,16 +1418,9 @@ msgstr "<option>--no-enhances</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:317 -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be twicked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1458,7 +1451,7 @@ msgstr "" "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1575,14 +1568,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: 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;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "Ficheiros" @@ -1593,9 +1586,9 @@ 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 msgid "See Also" msgstr "Veja também" @@ -1607,8 +1600,8 @@ 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "Diagnóstico" @@ -1737,12 +1730,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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>" @@ -1995,7 +1988,7 @@ msgid "Just show the contents of the configuration space." msgstr "Apenas mostra o conteúdo do espaço de configuração." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: 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;" @@ -3144,25 +3137,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, 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><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" +"Valores para os campos de metadados adicionais no ficheiro Release são " +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: 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:542 +#: 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>." @@ -3171,7 +3182,7 @@ msgstr "" "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -3185,12 +3196,12 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: 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:556 +#: 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 " @@ -3203,12 +3214,12 @@ msgstr "" "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: 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:564 +#: 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 " @@ -3224,12 +3235,12 @@ msgstr "" "de Configuração: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: 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:574 +#: 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</" @@ -3240,12 +3251,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: 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:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3254,12 +3265,12 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: 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:585 +#: 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 " @@ -3273,12 +3284,12 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: 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:593 +#: 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 " @@ -3302,12 +3313,12 @@ msgstr "" "as verificações extras serão desnecessárias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: 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:605 +#: 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 " @@ -3322,19 +3333,19 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 msgid "Examples" msgstr "Examples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3343,7 +3354,7 @@ msgstr "" "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3813,7 +3824,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4683,24 +4694,8 @@ msgstr "" "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " "remove do chaveiro as chaves de arquivo que já não são válidas." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -#, fuzzy -#| msgid "update" -msgid "net-update" -msgstr "update" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4709,12 +4704,12 @@ msgstr "" "secção prévia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4731,57 +4726,53 @@ msgstr "" "chaves são adicionadas a este." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "Base de dados local de confiança de chaves de arquivos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "Chaveiro das chaves de confiança dos arquivos Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "Agosto 2009</date>" @@ -4798,22 +4789,13 @@ msgstr "marca/desmarca um pacote como sendo instalado automaticamente" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " -#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " -#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" -#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" -#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice=" @@ -4823,7 +4805,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4832,7 +4814,7 @@ msgstr "" "sendo instalado automaticamente." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4848,21 +4830,14 @@ msgstr "" "command> ou <command>aptitude</command> (exemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "<literal>markauto</literal> is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4871,19 +4846,14 @@ msgstr "" "nenhum pacote instalado manualmente depender deste pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" -msgstr "" +#: apt-mark.8.xml:76 +msgid "unmarkauto" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "<literal>unmarkauto</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4892,95 +4862,21 @@ msgstr "" "automaticamente se nenhum outro pacote depender dele." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 -msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." -msgstr "" -"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " -"instalados automaticamente com cada pacote numa linha nova." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 +#: apt-mark.8.xml:84 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." +#: apt-mark.8.xml:85 msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." -msgstr "" -"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " -"instalados automaticamente com cada pacote numa linha nova." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" -msgid "showmanual" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" -msgid "showhold" -msgstr "showauto" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of automatically " -#| "installed packages with each package on a new line." -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +"installed packages with each package on a new line." msgstr "" "<literal>showauto</literal> é usado para escrever uma lista dos pacotes " "instalados automaticamente com cada pacote numa linha nova." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 +#: apt-mark.8.xml:96 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -4988,7 +4884,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 +#: apt-mark.8.xml:97 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4997,7 +4893,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 +#: apt-mark.8.xml:100 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5009,18 +4905,48 @@ msgstr "" "localização predefinida, a qual é <filename>extended_status</filename> no " "directório definido pelo Item de Configuração: <literal>Dir::State</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." +msgstr "Mostra um curto sumário de utilização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:116 +msgid "Show the program version." +msgstr "Mostra a versão do programa." + #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5494,12 +5420,11 @@ msgstr "" #| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente " "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão " @@ -6520,9 +6445,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -6543,7 +6468,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -7818,8 +7743,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -8275,84 +8200,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -#| msgid "" -#| "Package: *\n" -#| "Pin: release a=unstable\n" -#| "Pin-Priority: 50\n" -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -#, fuzzy -#| msgid "Packages" -msgid "Package" -msgstr "Packages" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta as Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8361,12 +8219,12 @@ msgstr "" "na versão do pacote (downgrade)" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8375,12 +8233,12 @@ msgstr "" "destino, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8390,12 +8248,12 @@ msgstr "" "mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8405,12 +8263,12 @@ msgstr "" "recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8419,17 +8277,17 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 msgid "prevents the version from being installed" msgstr "previne a instalação da versão" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8440,7 +8298,7 @@ msgstr "" "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8454,7 +8312,7 @@ msgstr "" "determina a prioridade da versão de pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8463,7 +8321,7 @@ msgstr "" "registos apresentados atrás:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, no-wrap msgid "" "Package: perl\n" @@ -8491,12 +8349,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "Então:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8511,7 +8369,7 @@ msgstr "" "downgrade ao <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8522,7 +8380,7 @@ msgstr "" "versões, mesmo versões que pertencem ao lançamento de destino." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8535,12 +8393,12 @@ msgstr "" "instalação e se nenhuma versão do pacote já estiver instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8551,27 +8409,27 @@ msgstr "" "descrever os pacotes disponÃveis nessa localização." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 msgid "gives the package name" msgstr "fornece o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 msgid "gives the version number for the named package" msgstr "fornece o número de versão do pacote nomeado" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8592,12 +8450,12 @@ msgstr "" "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8614,18 +8472,18 @@ msgstr "" "requerer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8642,13 +8500,13 @@ msgstr "" "preferências do APT requer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8664,7 +8522,7 @@ msgstr "" "seguintes linhas:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8676,12 +8534,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8699,18 +8557,18 @@ msgstr "" "a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8723,18 +8581,18 @@ msgstr "" "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8747,13 +8605,13 @@ msgstr "" "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8776,7 +8634,7 @@ msgstr "" "APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8801,12 +8659,12 @@ msgstr "" "literal> da distribuição <literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais num Registo de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8817,12 +8675,12 @@ msgstr "" "literal>. Isto disponibiliza um espaço para comentários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 msgid "Tracking Stable" msgstr "Acompanhando Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8846,7 +8704,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8862,8 +8720,8 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8875,7 +8733,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8888,13 +8746,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8907,12 +8765,12 @@ msgstr "" "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 msgid "Tracking Testing or Unstable" msgstr "Acompanhando Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, no-wrap msgid "" "Package: *\n" @@ -8940,7 +8798,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8957,7 +8815,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8970,13 +8828,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8995,12 +8853,12 @@ msgstr "" "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "Acompanhando a evolução de um nome de código de lançamento" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9034,7 +8892,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9060,7 +8918,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9073,13 +8931,13 @@ msgstr "" "codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9098,12 +8956,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11132,27 +10990,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." #~ "Ãndice gerados não terão campos MD5Sum onde possÃveis. Item de " #~ "Configuração: <literal>APT::FTPArchive::MD5</literal>" -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -#~ msgid "Show a short usage summary." -#~ msgstr "Mostra um curto sumário de utilização." - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -#~ msgid "Show the program version." -#~ msgstr "Mostra a versão do programa." - #~ msgid "to the version that is already installed (if any)." #~ msgstr "para a versão que já está instalada (se alguma)." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0f171479f..ebf4bd68e 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-04-05 10:22+0300\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André LuÃs Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -578,7 +578,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 #, fuzzy @@ -960,7 +960,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -984,7 +984,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 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 "" @@ -1005,12 +1005,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 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 "" @@ -1085,7 +1085,7 @@ msgstr "" #: apt-cache.8.xml:317 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: <literal>APT::Cache::" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." @@ -1109,7 +1109,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1205,14 +1205,14 @@ 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:612 apt-get.8.xml:570 -#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:654 msgid "Files" msgstr "" @@ -1223,9 +1223,9 @@ msgstr "" #. 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:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 +#: 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:661 #: sources.list.5.xml:234 #, fuzzy msgid "See Also" @@ -1238,8 +1238,8 @@ msgstr "" #. 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:632 apt-get.8.xml:591 -#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +#: 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 "" @@ -1338,12 +1338,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:142 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 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 "" @@ -1548,7 +1548,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 #, fuzzy msgid "&apt-conf;" @@ -2478,26 +2478,26 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " -"<literal><replaceable>Index</replaceable></literal> can be " -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be " -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +"<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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:540 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:542 +#: 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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:548 +#: 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 " @@ -2506,12 +2506,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:556 +#: 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 " @@ -2520,12 +2520,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:562 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:564 +#: 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 " @@ -2535,12 +2535,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:572 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:574 +#: 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</" @@ -2548,24 +2548,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:578 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:584 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:585 +#: 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 " @@ -2574,12 +2574,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:591 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:593 +#: 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 " @@ -2593,12 +2593,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:603 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:605 +#: 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 " @@ -2608,27 +2608,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 #: sources.list.5.xml:198 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:623 +#: 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 "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:633 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -2951,7 +2951,7 @@ msgstr "" #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " -"current directory." +"current directoy." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -3639,29 +3639,15 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 -msgid "net-update" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 -msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." -msgstr "" - #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:143 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:145 #, fuzzy msgid "--keyring <replaceable>filename</replaceable>" msgstr "" @@ -3669,7 +3655,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:146 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3680,44 +3666,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:159 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:161 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt.conf</>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:162 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:165 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:166 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:169 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:170 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:179 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -3726,8 +3712,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " -"April 2011</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3746,21 +3732,20 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" -"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> </group>" +"arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:57 +#: apt-mark.8.xml:56 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:61 +#: apt-mark.8.xml:60 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3770,132 +3755,108 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:69 -msgid "auto" +#: apt-mark.8.xml:68 +msgid "markauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:70 +#: apt-mark.8.xml:69 msgid "" -"<literal>auto</literal> is used to mark a package as being automatically " +"<literal>markauto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:77 -msgid "manual" +#: apt-mark.8.xml:76 +msgid "unmarkauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:78 +#: apt-mark.8.xml:77 msgid "" -"<literal>manual</literal> is used to mark a package as being manually " +"<literal>unmarkauto</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:85 -msgid "hold" +#: apt-mark.8.xml:84 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:86 +#: apt-mark.8.xml:85 msgid "" -"<literal>hold</literal> is used to mark a package as hold back, which will " -"prevent the package from being automatically installed, upgraded or " -"removed. The command is only a wrapper around <command>dpkg --set-" -"selections</command> and the state is therefore maintained by &dpkg; and not " -"effected by the <option>--filename</option> option." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:95 -msgid "unhold" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 msgid "" -"<literal>unhold</literal> is used to cancel a previously set hold on a " -"package to allow all actions again." +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:101 -msgid "showauto" +#: apt-mark.8.xml:97 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:102 +#: apt-mark.8.xml:100 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line. All automatically " -"installed packages will be listed if no package is given. If packages are " -"given only those which are automatically installed will be shown." +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:109 -msgid "showmanual" -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:110 -msgid "" -"<literal>showmanual</literal> can be used in the same way as " -"<literal>showauto</literal> except that it will print a list of manually " -"installed packages instead." +#: apt-mark.8.xml:106 +msgid "<option>-h</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:116 -msgid "showhold" +#: apt-mark.8.xml:107 +msgid "<option>--help</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:117 -msgid "" -"<literal>showhold</literal> is used to print a list of packages on hold in " -"the same way as for the other show commands." +#: apt-mark.8.xml:108 +msgid "Show a short usage summary." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:130 -msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +#: apt-mark.8.xml:114 +msgid "<option>-v</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:131 -msgid "" -"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" -"option>" +#: apt-mark.8.xml:115 +msgid "<option>--version</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:134 -msgid "" -"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" -"filename> instead of the default location, which is " -"<filename>extended_status</filename> in the directory defined by the " -"Configuration Item: <literal>Dir::State</literal>." +#: apt-mark.8.xml:116 +msgid "Show the program version." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:146 +#: apt-mark.8.xml:127 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:151 +#: apt-mark.8.xml:132 #, fuzzy msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:155 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -4232,12 +4193,11 @@ msgstr "" #: apt.conf.5.xml:52 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -"order which have either no or \"<literal>conf</literal>\" as filename " -"extension and which only contain alphanumeric, hyphen (-), underscore (_) " -"and period (.) characters. Otherwise APT will print a notice that it has " -"ignored a file if the file doesn't match a pattern in the <literal>Dir::" -"Ignore-Files-Silently</literal> configuration list - in this case it will be " -"silently ignored." +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters. Otherwise APT will print a notice that it has ignored a file if " +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</" +"literal> configuration list - in this case it will be silently ignored." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -4935,9 +4895,9 @@ msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " "will only be used if this file exists, e.g. for the bzip2 method (the " -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note " -"also that list entries specified on the command line will be added at the " -"end of the list specified in the configuration files, but before the default " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " "entries. To prefer a type in this case over the ones specified in the " "configuration files you can set the option direct - not in list style. This " "will not override the defined list, it will only prefix the list with this " @@ -4948,7 +4908,7 @@ msgstr "" #: apt.conf.5.xml:449 msgid "" "The special type <literal>uncompressed</literal> can be used to give " -"uncompressed files a preference, but note that most archives don't provide " +"uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" @@ -5932,8 +5892,8 @@ msgstr "" msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " -"following naming convention: The files have either no or \"<literal>pref</" -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " "underscore (_) and period (.) characters. Otherwise APT will print a notice " "that it has ignored a file if the file doesn't match a pattern in the " "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " @@ -6387,78 +6347,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:262 -msgid "Regular expressions and glob() syntax" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:264 -msgid "" -"APT also supports pinning by glob() expressions and regular expressions " -"surrounded by /. For example, the following example assigns the priority 500 " -"to all packages from experimental where the name starts with gnome (as a glob" -"()-like expression) or contains the word kde (as a POSIX extended regular " -"expression surrounded by slashes)." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:273 -#, fuzzy, no-wrap -msgid "" -"Package: gnome* /kde/\n" -"Pin: release n=experimental\n" -"Pin-Priority: 500\n" -msgstr "" -"<programlisting>\n" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:279 -msgid "" -"The rule for those expressions is that they can occur anywhere where a " -"string can occur. Thus, the following pin assigns the priority 990 to all " -"packages from a release starting with karmic." -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:285 -#, fuzzy, no-wrap -msgid "" -"Package: *\n" -"Pin: release n=karmic*\n" -"Pin-Priority: 990\n" -msgstr "" -"<programlisting>\n" -"Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:290 -msgid "Package" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><literal> -#: apt_preferences.5.xml:296 -msgid "*" -msgstr "" - -#. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:263 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:314 +#: apt_preferences.5.xml:271 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:272 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6468,13 +6369,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:276 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:277 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6484,13 +6385,13 @@ msgstr "" "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:282 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:326 +#: apt_preferences.5.xml:283 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6500,13 +6401,13 @@ msgstr "" "disponÃvel pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 +#: apt_preferences.5.xml:288 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:289 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6517,13 +6418,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:294 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:338 +#: apt_preferences.5.xml:295 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6533,19 +6434,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:299 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:343 +#: apt_preferences.5.xml:300 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:309 +#: apt_preferences.5.xml:266 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6557,7 +6458,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:305 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6573,7 +6474,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:354 +#: apt_preferences.5.xml:311 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6583,7 +6484,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:315 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6612,12 +6513,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:371 +#: apt_preferences.5.xml:328 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:373 +#: apt_preferences.5.xml:330 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6633,7 +6534,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:378 +#: apt_preferences.5.xml:335 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6645,7 +6546,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:339 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6660,13 +6561,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:392 +#: apt_preferences.5.xml:349 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:351 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6678,31 +6579,31 @@ msgstr "" "os pacotes disponÃveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:363 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:407 +#: apt_preferences.5.xml:364 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 +#: apt_preferences.5.xml:367 apt_preferences.5.xml:417 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:411 +#: apt_preferences.5.xml:368 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:398 +#: apt_preferences.5.xml:355 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6724,13 +6625,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:427 +#: apt_preferences.5.xml:384 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:428 +#: apt_preferences.5.xml:385 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6748,7 +6649,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:438 +#: apt_preferences.5.xml:395 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6756,13 +6657,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:444 +#: apt_preferences.5.xml:401 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:445 +#: apt_preferences.5.xml:402 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6780,7 +6681,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:411 #, fuzzy, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" @@ -6788,7 +6689,7 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:418 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6805,7 +6706,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:470 +#: apt_preferences.5.xml:427 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6818,13 +6719,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:436 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:480 +#: apt_preferences.5.xml:437 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6843,7 +6744,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:446 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6851,13 +6752,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:452 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:496 +#: apt_preferences.5.xml:453 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6871,7 +6772,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:459 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6879,13 +6780,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:465 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:466 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6898,7 +6799,7 @@ msgstr "" "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:515 +#: apt_preferences.5.xml:472 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6906,7 +6807,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:373 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6930,7 +6831,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:522 +#: apt_preferences.5.xml:479 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6956,13 +6857,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:492 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:494 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6974,13 +6875,13 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:546 +#: apt_preferences.5.xml:503 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:554 +#: apt_preferences.5.xml:511 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -7005,7 +6906,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:505 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -7021,8 +6922,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 -#: apt_preferences.5.xml:675 +#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 +#: apt_preferences.5.xml:632 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -7035,7 +6936,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:523 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7048,7 +6949,7 @@ msgstr "" "ulÃtma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:583 +#: apt_preferences.5.xml:540 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -7056,7 +6957,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:577 +#: apt_preferences.5.xml:534 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7069,13 +6970,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:589 +#: apt_preferences.5.xml:546 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:598 +#: apt_preferences.5.xml:555 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7104,7 +7005,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7121,7 +7022,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:612 +#: apt_preferences.5.xml:569 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7134,7 +7035,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:632 +#: apt_preferences.5.xml:589 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7142,7 +7043,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:580 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7162,12 +7063,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:639 +#: apt_preferences.5.xml:596 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:653 +#: apt_preferences.5.xml:610 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7197,7 +7098,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:641 +#: apt_preferences.5.xml:598 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7212,7 +7113,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:670 +#: apt_preferences.5.xml:627 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7225,7 +7126,7 @@ msgstr "" "ulÃtma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:690 +#: apt_preferences.5.xml:647 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7233,7 +7134,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:681 +#: apt_preferences.5.xml:638 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7253,13 +7154,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:699 +#: apt_preferences.5.xml:656 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:705 +#: apt_preferences.5.xml:662 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/po/apt-all.pot b/po/apt-all.pot index 73ed82195..00291f568 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: 2011-04-05 10:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -90,82 +90,80 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 +#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1273 -msgid "You must give at least one search pattern" +#: 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 "" -#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 -#: cmdline/apt-cache.cc:1508 -msgid "No packages found" +#: cmdline/apt-cache.cc:1221 +msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1481 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 +#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1579 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1502 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1559 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1575 +#: cmdline/apt-cache.cc:1522 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1523 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1549 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1615 +#: cmdline/apt-cache.cc:1556 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1565 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1678 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:3106 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1745 +#: cmdline/apt-cache.cc:1685 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" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\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" @@ -250,7 +248,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1148 #, c-format msgid "Unable to write to %s" msgstr "" @@ -369,97 +367,92 @@ msgstr "" msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:73 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:139 msgid "E: " msgstr "" -#: ftparchive/writer.cc:136 +#: ftparchive/writer.cc:141 msgid "W: " msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:148 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 +#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:174 +#: ftparchive/writer.cc:179 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:201 +#: ftparchive/writer.cc:206 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:260 +#: ftparchive/writer.cc:265 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:268 +#: ftparchive/writer.cc:273 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:272 +#: ftparchive/writer.cc:277 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:279 +#: ftparchive/writer.cc:284 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:294 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:393 +#: ftparchive/writer.cc:398 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:406 ftparchive/writer.cc:703 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:464 ftparchive/writer.cc:793 +#: ftparchive/writer.cc:472 ftparchive/writer.cc:811 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:698 +#: ftparchive/writer.cc:713 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:702 +#: ftparchive/writer.cc:717 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:321 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" - -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 msgid "realloc - Failed to allocate memory" msgstr "" @@ -488,63 +481,63 @@ msgstr "" msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:72 +#: ftparchive/multicompress.cc:67 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:102 +#: ftparchive/multicompress.cc:97 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:195 +#: ftparchive/multicompress.cc:191 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:212 +#: ftparchive/multicompress.cc:208 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:235 +#: ftparchive/multicompress.cc:231 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:286 +#: ftparchive/multicompress.cc:282 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:321 +#: ftparchive/multicompress.cc:319 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:360 +#: ftparchive/multicompress.cc:358 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:401 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:453 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:470 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -592,94 +585,94 @@ msgstr "" msgid " or" msgstr "" -#: cmdline/apt-get.cc:392 +#: cmdline/apt-get.cc:390 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:420 +#: cmdline/apt-get.cc:416 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:438 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:459 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:555 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:563 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:594 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:609 +#: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:600 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:613 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:617 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:645 +#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:651 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:662 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:684 +#: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:676 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -687,177 +680,177 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:705 +#: cmdline/apt-get.cc:694 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:728 +#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:759 +#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:789 +#: cmdline/apt-get.cc:778 #, 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:782 #, 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:794 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:808 +#: cmdline/apt-get.cc:799 #, 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:818 cmdline/apt-get.cc:2080 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:853 +#: cmdline/apt-get.cc:844 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:898 +#: cmdline/apt-get.cc:893 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:973 +#: cmdline/apt-get.cc:971 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:974 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:977 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:982 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:986 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:989 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1016 +#: cmdline/apt-get.cc:1014 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1018 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1029 +#: cmdline/apt-get.cc:1027 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 +#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1077 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1088 +#: cmdline/apt-get.cc:1086 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1099 +#: cmdline/apt-get.cc:1097 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1135 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:1142 #, 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:1147 #, 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:1154 #, 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:1159 #, 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2484 +#: cmdline/apt-get.cc:2487 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1187 #, 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:1203 cmdline/apt-get.cc:1223 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1209 +#: cmdline/apt-get.cc:1207 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,46 +858,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 +#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1230 +#: cmdline/apt-get.cc:1228 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:1300 cmdline/apt-get.cc:2544 apt-pkg/algorithms.cc:1427 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1320 +#: cmdline/apt-get.cc:1318 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 +#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2553 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1327 +#: cmdline/apt-get.cc:1325 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:1329 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1336 +#: cmdline/apt-get.cc:1334 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1337 +#: cmdline/apt-get.cc:1335 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -914,35 +907,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1369 +#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1497 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1529 #, 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:1567 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1645 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1740 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -958,15 +951,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1747 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1754 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -975,7 +968,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1717 +#: cmdline/apt-get.cc:1758 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -983,25 +976,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1719 +#: cmdline/apt-get.cc:1760 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1779 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1828 +#: cmdline/apt-get.cc:1878 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1882 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:1898 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 +1002,74 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1861 +#: cmdline/apt-get.cc:1916 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1942 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2032 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:2033 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2022 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2029 +#: cmdline/apt-get.cc:2082 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2050 +#: cmdline/apt-get.cc:2103 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2106 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2111 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 +#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2186 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2243 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2233 +#: cmdline/apt-get.cc:2294 +#, c-format +msgid "Downloading %s %s" +msgstr "" + +#: cmdline/apt-get.cc:2350 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:2390 cmdline/apt-get.cc:2671 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2406 #, 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:2411 #, c-format msgid "" "Please use:\n" @@ -1079,115 +1077,120 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2462 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2380 +#: cmdline/apt-get.cc:2497 #, 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:2505 #, 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:2510 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2516 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2432 +#: cmdline/apt-get.cc:2549 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2462 +#: cmdline/apt-get.cc:2579 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2591 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2475 +#: cmdline/apt-get.cc:2592 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2492 +#: cmdline/apt-get.cc:2609 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2512 +#: cmdline/apt-get.cc:2629 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2645 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2559 +#: cmdline/apt-get.cc:2676 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2579 +#: cmdline/apt-get.cc:2696 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2630 +#: cmdline/apt-get.cc:2747 #, 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:2800 #, 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:2836 #, 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:2863 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2762 +#: cmdline/apt-get.cc:2879 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2884 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2798 +#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 +#, c-format +msgid "Changelog for %s (%s)" +msgstr "" + +#: cmdline/apt-get.cc:3111 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:3152 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1213,6 +1216,8 @@ msgid "" " 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" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1233,7 +1238,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2995 +#: cmdline/apt-get.cc:3316 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1335,7 +1340,7 @@ msgstr "" msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 msgid "Corrupted archive" msgstr "" @@ -1343,7 +1348,7 @@ msgstr "" msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:300 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1451,28 +1456,28 @@ msgstr "" msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:429 #, c-format msgid "File %s/%s overwrites the one in the package %s" 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 -#: methods/mirror.cc:87 +#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:180 +#: 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:302 +#: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:489 #, c-format msgid "Unable to stat %s" msgstr "" @@ -1496,9 +1501,9 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 -#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 -#: apt-pkg/pkgcachegen.cc:1326 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1047 +#: apt-pkg/pkgcachegen.cc:1151 apt-pkg/pkgcachegen.cc:1157 +#: apt-pkg/pkgcachegen.cc:1303 msgid "Reading package lists" msgstr "" @@ -1571,51 +1576,57 @@ msgstr "" msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:50 +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:53 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:110 +#: apt-inst/deb/debfile.cc:113 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:140 -msgid "Internal error, could not locate member" +#: apt-inst/deb/debfile.cc:154 +#, c-format +msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:173 +#: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:258 +#: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" msgstr "" -#: methods/bzip2.cc:65 +#: methods/bzip2.cc:60 methods/gzip.cc:52 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/bzip2.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/bzip2.cc:109 +#: methods/bzip2.cc:108 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 -#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 -#: methods/rred.cc:495 +#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 +#: methods/rred.cc:533 msgid "Failed to stat" msgstr "" -#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 -#: methods/rred.cc:492 +#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 +#: methods/rred.cc:530 msgid "Failed to set modification time" msgstr "" @@ -1643,7 +1654,7 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "" @@ -1695,7 +1706,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "" @@ -1703,11 +1714,11 @@ 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:820 methods/rsh.cc:191 msgid "Read error" msgstr "" -#: methods/ftp.cc:351 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "" @@ -1715,7 +1726,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:862 methods/rsh.cc:233 msgid "Write error" msgstr "" @@ -1769,7 +1780,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 +#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1778,7 +1789,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:897 methods/rsh.cc:321 +#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" @@ -1828,7 +1839,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:149 methods/rsh.cc:424 +#: methods/connect.cc:149 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1947,7 +1958,7 @@ msgstr "" msgid "Error reading from server" msgstr "" -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 +#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283 msgid "Failed to truncate file" msgstr "" @@ -1985,21 +1996,21 @@ msgstr "" msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:300 +#: apt-pkg/contrib/mmap.cc:302 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:399 +#: apt-pkg/contrib/mmap.cc:401 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:402 +#: apt-pkg/contrib/mmap.cc:404 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2028,7 +2039,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1119 +#: apt-pkg/contrib/strutl.cc:1138 #, c-format msgid "Selection %s not found" msgstr "" @@ -2144,113 +2155,129 @@ msgstr "" msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:52 +#: apt-pkg/contrib/cdromutl.cc:53 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 +#: apt-pkg/contrib/cdromutl.cc:176 apt-pkg/contrib/cdromutl.cc:210 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:93 +#: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:217 +#: apt-pkg/contrib/cdromutl.cc:218 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:168 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:159 +#: apt-pkg/contrib/fileutl.cc:173 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:177 +#: apt-pkg/contrib/fileutl.cc:191 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:181 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:321 +#: apt-pkg/contrib/fileutl.cc:335 #, 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:362 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:380 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:389 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:673 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:693 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:681 +#: apt-pkg/contrib/fileutl.cc:699 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:746 +#: apt-pkg/contrib/fileutl.cc:764 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:763 +#: apt-pkg/contrib/fileutl.cc:781 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:823 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:856 +#: apt-pkg/contrib/fileutl.cc:874 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:1010 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:988 +#: apt-pkg/contrib/fileutl.cc:1013 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:993 +#: apt-pkg/contrib/fileutl.cc:1018 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1004 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1017 +#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" msgstr "" @@ -2357,11 +2384,6 @@ msgstr "" msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:922 -#, c-format -msgid "Internal error, group '%s' has no installable pseudo package" -msgstr "" - #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" @@ -2442,14 +2464,14 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 +#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:452 +#: apt-pkg/packagemanager.cc:445 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2457,7 +2479,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/packagemanager.cc:495 +#: apt-pkg/packagemanager.cc:485 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " @@ -2469,25 +2491,25 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:292 +#: apt-pkg/algorithms.cc:249 #, c-format 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:1175 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1220 +#: apt-pkg/algorithms.cc:1177 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:1453 apt-pkg/algorithms.cc:1455 msgid "" -"Some index files failed to download, they have been ignored, or old ones " +"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" @@ -2528,17 +2550,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:424 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:149 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:165 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2563,17 +2585,17 @@ msgstr "" msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:344 +#: apt-pkg/policy.cc:339 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:366 +#: apt-pkg/policy.cc:361 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:374 +#: apt-pkg/policy.cc:369 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2581,155 +2603,167 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:198 +#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:204 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:253 +#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:285 +#: apt-pkg/pkgcachegen.cc:274 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:289 +#: apt-pkg/pkgcachegen.cc:278 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 -#: apt-pkg/pkgcachegen.cc:324 +#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:313 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:353 +#: apt-pkg/pkgcachegen.cc:342 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:360 +#: apt-pkg/pkgcachegen.cc:348 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:363 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:366 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:369 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:398 +#: apt-pkg/pkgcachegen.cc:386 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:412 +#: apt-pkg/pkgcachegen.cc:400 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:418 +#: apt-pkg/pkgcachegen.cc:406 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:982 +#: apt-pkg/pkgcachegen.cc:959 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1087 +#: apt-pkg/pkgcachegen.cc:1064 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 +#: apt-pkg/pkgcachegen.cc:1242 apt-pkg/pkgcachegen.cc:1249 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:136 +#: apt-pkg/acquire-item.cc:135 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:484 +#: apt-pkg/acquire-item.cc:628 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 -#: apt-pkg/acquire-item.cc:1717 +#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 +#: apt-pkg/acquire-item.cc:1921 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1244 +#: apt-pkg/acquire-item.cc:1346 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1361 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" + +#: apt-pkg/acquire-item.cc:1397 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) -#: apt-pkg/acquire-item.cc:1281 +#: apt-pkg/acquire-item.cc:1434 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1302 +#: apt-pkg/acquire-item.cc:1455 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1328 +#: apt-pkg/acquire-item.cc:1488 #, c-format 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 "" -#: apt-pkg/acquire-item.cc:1337 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1569 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1424 +#: apt-pkg/acquire-item.cc:1628 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1479 +#: apt-pkg/acquire-item.cc:1683 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1770 msgid "Size mismatch" msgstr "" @@ -2738,27 +2772,27 @@ msgstr "" msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:60 +#: apt-pkg/indexrecords.cc:63 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:94 +#: apt-pkg/indexrecords.cc:97 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:107 +#: apt-pkg/indexrecords.cc:110 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:122 +#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" -#: apt-pkg/vendorlist.cc:66 +#: apt-pkg/vendorlist.cc:71 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" @@ -2846,22 +2880,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2933,12 +2967,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835 #, c-format msgid "Removing %s" msgstr "" @@ -2959,92 +2993,99 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:646 +#: apt-pkg/deb/dpkgpm.cc:651 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:816 +#: apt-pkg/deb/dpkgpm.cc:821 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:817 +#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:822 +#: apt-pkg/deb/dpkgpm.cc:827 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 +#: apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:829 +#: apt-pkg/deb/dpkgpm.cc:834 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:831 +#: apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:836 +#: apt-pkg/deb/dpkgpm.cc:841 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:837 +#: apt-pkg/deb/dpkgpm.cc:842 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1043 +#: apt-pkg/deb/dpkgpm.cc:1062 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1074 +#: apt-pkg/deb/dpkgpm.cc:1093 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1277 +#: apt-pkg/deb/dpkgpm.cc:1301 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1282 +#: apt-pkg/deb/dpkgpm.cc:1306 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1284 +#: apt-pkg/deb/dpkgpm.cc:1308 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1290 +#: apt-pkg/deb/dpkgpm.cc:1314 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1296 +#: apt-pkg/deb/dpkgpm.cc:1321 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1303 +#. 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:1327 +#, c-format +msgid "short read in buffer_copy %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1337 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3075,30 +3116,37 @@ msgstr "" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:200 +#: methods/mirror.cc:256 #, c-format msgid "No mirror file '%s' found " msgstr "" -#: methods/mirror.cc:343 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:263 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:407 #, c-format msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:465 +#: methods/rred.cc:503 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:470 +#: methods/rred.cc:508 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" -#: methods/rsh.cc:329 +#: methods/rsh.cc:330 msgid "Connection closed prematurely" 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/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 Binary files differnew file mode 100644 index 000000000..2ce60d454 --- /dev/null +++ b/share/ubuntu-archive.gpg |