From: Michael Vogt Date: Tue, 30 Apr 2013 08:44:16 +0000 (+0200) Subject: merged from the debian-sid branch X-Git-Tag: 0.9.13.exp1ubuntu1~15 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3599bca5211077f5456a40adb5cec1bcbee8c3ae merged from the debian-sid branch --- 3599bca5211077f5456a40adb5cec1bcbee8c3ae diff --cc apt-pkg/deb/dpkgpm.cc index b4fcf47b6,3bc31dc37..3dec4bb39 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@@ -1621,24 -1590,7 +1620,25 @@@ void pkgDPkgPM::WriteApportReport(cons log = fopen(logfile_name.c_str(),"r"); if(log != NULL) { + char buf[1024]; + 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 --cc configure.in index 88fa27851,91a157c33..44334e3e9 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" - PACKAGE_VERSION="0.9.7.7ubuntu4" -PACKAGE_VERSION="0.9.7.9~exp3" ++PACKAGE_VERSION="0.9.7.9~exp3ubuntu1" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --cc debian/changelog index cdc7912cc,7944d76ef..1194658c2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,47 -1,190 +1,240 @@@ ++apt (0.9.7.9~exp3ubuntu1) UNRELEASEDsaucy; urgency=low ++ ++ * merged from debian ++ ++ -- Michael Vogt Tue, 30 Apr 2013 10:28:43 +0200 ++ + apt (0.9.7.9~exp3) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/sourcelist.cc: + - fix segfault when a hostname contains a [, thanks to + Tzafrir Cohen (closes: #704653) + * debian/control: + - replace manpages-it (closes: #704723) + + [ David Kalnischkies ] + * various simple changes to fix cppcheck warnings + * apt-pkg/pkgcachegen.cc: + - do not store the MD5Sum for every description language variant as + it will be the same for all so it can be shared to save cache space + - handle language tags for descriptions are unique strings to be shared + - factor version string creation out of NewDepends, so we can easily reuse + version strings e.g. for implicit multi-arch dependencies + - equal comparisions are used mostly in same-source relations, + so use this to try to reuse some version strings + - sort group and package names in the hashtable on insert + - share version strings between same versions (of different architectures) + to save some space and allow quick comparisions later on + * apt-pkg/pkgcache.cc: + - assume sorted hashtable entries for groups/packages + * apt-pkg/cacheiterators.h: + - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck + * apt-pkg/deb/debversion.cc: + - add a string-equal shortcut for equal version comparisions + + [ Marc Deslauriers ] + * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + [ Yaroslav Halchenko ] + * Fix English spelling error in a message ('A error'). Unfuzzy + translations. Closes: #705087 + + [ Programs translations ] + * French translation completed (Christian Perrier) + + [ Manpages translations ] + * French translation completed (Christian Perrier) + + -- Michael Vogt Mon, 08 Apr 2013 17:09:00 +0200 + + apt (0.9.7.9~exp2) experimental; urgency=low + + [ Programs translations ] + * Update all PO files and apt-all.pot + * French translation completed (Christian Perrier) + + [ Daniel Hartwig ] + * cmdline/apt-get.cc: + - do not have space between "-a" and option when cross building + (closes: #703792) + * test/integration/test-apt-get-download: + - fix test now that #1098752 is fixed + * po/{ca,cs,ru}.po: + - fix merge artifact + + [ David Kalnischkies ] + * apt-pkg/indexcopy.cc: + - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc + * apt-pkg/contrib/gpgv.cc: + - ExecGPGV is a method which should never return, so mark it as such + and fix the inconsistency of returning in error cases + - don't close stdout/stderr if it is also the statusfd + - if ExecGPGV deals with a clear-signed file it will split this file + into data and signatures, pass it to gpgv for verification + - add method to open (maybe) clearsigned files transparently + * apt-pkg/acquire-item.cc: + - keep the last good InRelease file around just as we do it with + Release.gpg in case the new one we download isn't good for us + * apt-pkg/deb/debmetaindex.cc: + - reenable InRelease by default + * ftparchive/writer.cc, + apt-pkg/deb/debindexfile.cc, + apt-pkg/deb/deblistparser.cc: + - use OpenMaybeClearSignedFile to be free from detecting and + skipping clearsigning metadata in dsc and Release files + + [ Michael Vogt ] + * add regression test for CVE-2013-1051 + * implement GPGSplit() based on the idea from Ansgar Burchardt + (many thanks!) + * methods/connect.cc: + - use Errno() instead of strerror(), thanks to David Kalnischk + * doc/apt.conf.5.xml: + - document Acquire::ForceIPv{4,6} + + -- Michael Vogt Wed, 03 Apr 2013 14:19:58 +0200 + + apt (0.9.7.9~exp1) experimental; urgency=low + + [ Niels Thykier ] + * test/libapt/assert.h, test/libapt/run-tests: + - exit with status 1 on test failure + + [ Daniel Hartwig ] + * test/integration/framework: + - continue after test failure but preserve exit status + + [ Programs translation updates ] + * Turkish (Mert Dirik). Closes: #703526 + + [ Colin Watson ] + * methods/connect.cc: + - provide useful error message in case of EAI_SYSTEM + (closes: #703603) + + [ Michael Vogt ] + * add new config options "Acquire::ForceIPv4" and + "Acquire::ForceIPv6" to allow focing one or the other + (closes: #611891) + * lp:~mvo/apt/fix-tagfile-hash: + - fix false positives in pkgTagSection.Exists(), thanks to + Niels Thykier for the testcase (closes: #703240) + - this will require rebuilds of the clients as this used to + be a inline function + + -- Michael Vogt Fri, 22 Mar 2013 21:57:08 +0100 + + apt (0.9.7.8) unstable; urgency=criticial + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt Thu, 14 Mar 2013 07:47:36 +0100 + + apt (0.9.7.8~exp2) experimental; urgency=low + + * include two missing patches to really fix bug #696225, thanks to + Guillem Jover + * ensure sha512 is really used when available, thanks to Tyler Hicks + (LP: #1098752) + + -- Michael Vogt Fri, 01 Mar 2013 19:06:55 +0100 + + apt (0.9.7.8~exp1) experimental; urgency=low + + [ Manpages translation updates ] + * Italian (Beatrice Torracca). Closes: #696601 + + [ Programs translation updates ] + * Japanese (Kenshi Muto). Closes: #699783 + + [ Michael Vogt ] + * fix pkgProblemResolver::Scores, thanks to Paul Wise. + Closes: #697577 + * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann + for the report. Closes: #696923 + * apt-pkg/contrib/progress.cc: + - Make "..." translatable to fix inconsistencies in the output + of e.g. apt-get update. While this adds new translatable strings, + not having translations for them will not break anything. + Thanks to Guillem Jover. Closes: #696225 + * debian/apt.cron.daily: + - when reading from /dev/urandom, use less entropy and fix a rare + bug when the random number chksum is less than 1000. + Closes: #695285 + * methods/https.cc: + - reuse connection in https, thanks to Thomas Bushnell, BSG for the + patch. LP: #1087543, Closes: #695359 + - add missing curl_easy_cleanup() + * methods/http.cc: + - quote spaces in filenames to ensure as the http method is also + (potentially) used for non deb,dsc content that may contain + spaces, thanks to Daniel Hartwig and Thomas Bushnell + (LP: #1086997) + - quote plus in filenames to work around a bug in the S3 server + (LP: #1003633) + * apt-pkg/indexrecords.cc: + - support '\r' in the Release file + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - prefer to install packages which have an already installed M-A:same + sibling while choosing providers (LP: #1130419) + + -- Michael Vogt Fri, 01 Mar 2013 14:16:42 +0100 + +apt (0.9.7.7ubuntu4) raring; urgency=low + + [ Michael Vogt ] + * test/integration/test-bug-1078697-missing-source-hashes: + - add test for deb-src hash generation + + [ Marc Deslauriers ] + * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + -- Michael Vogt Thu, 11 Apr 2013 14:52:15 +0200 + +apt (0.9.7.7ubuntu3) raring; urgency=low + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt Thu, 14 Mar 2013 14:25:56 +0100 + +apt (0.9.7.7ubuntu2) raring; urgency=low + + * Cherry-pick from David's sid branch to fix a multiarch library + installation problem: + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - prefer to install packages which have an already installed M-A:same + sibling while choosing providers (LP: #1130419) + + -- Steve Langasek Fri, 01 Mar 2013 17:55:03 -0800 + +apt (0.9.7.7ubuntu1) raring; urgency=low + + * Merge from Debian unstable, pulling in new translations and fixes. + * Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard. + + -- Adam Conrad Fri, 18 Jan 2013 00:32:14 -0700 + apt (0.9.7.7) unstable; urgency=low [ Program translation updates ] diff --cc debian/control index e719035d0,49647340a..5cdacfc34 --- a/debian/control +++ b/debian/control @@@ -18,8 -17,8 +18,8 @@@ Vcs-Browser: http://code.launchpad.net/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg - Replaces: manpages-pl (<< 20060617-3~) + Replaces: manpages-pl (<< 20060617-3~), manpages-it Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager diff --cc doc/apt-verbatim.ent index f63ae23a1,2d6e96091..631a7dcab --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@@ -213,7 -213,7 +213,7 @@@ "> - - ++ diff --cc doc/po/apt-doc.pot index 3617455d0,9ecd1ac03..b20761bf9 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -6,9 -6,9 +6,9 @@@ #, fuzzy msgid "" msgstr "" - "Project-Id-Version: apt-doc 0.9.7.7ubuntu3\n" -"Project-Id-Version: apt-doc 0.9.7.9~exp2\n" ++"Project-Id-Version: apt-doc 0.9.7.9~exp3ubuntu1\n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2013-04-11 14:52+0300\n" -"POT-Creation-Date: 2013-04-08 15:40+0300\n" ++"POT-Creation-Date: 2013-04-30 10:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc doc/po/de.po index f03b5ae35,e4c7420b4..e2052297f --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2013-03-02 01:57+0000\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" ++"POT-Creation-Date: 2013-04-30 10:29+0300\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@@ -2261,7 -2261,6 +2261,13 @@@ msgstr " #. type: Content of: #: apt-key.8.xml:130 +#, fuzzy ++#| msgid "" ++#| "Update the local keyring with the archive keyring and remove from the " ++#| "local keyring the archive keys which are no longer valid. The archive " ++#| "keyring is shipped in the archive-keyring package of " ++#| "your distribution, e.g. the debian-archive-keyring " ++#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " @@@ -2336,28 -2335,24 +2342,33 @@@ msgstr "lokale Datenbank vertrauenswür #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +#, fuzzy ++#| msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs" #. type: Content of: #: apt-key.8.xml:187 +#, fuzzy ++#| msgid "" ++#| "/usr/share/keyrings/debian-archive-removed-keys.gpg" msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" msgstr "" "/usr/share/keyrings/debian-archive-removed-keys.gpg" #. type: Content of: #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "" "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs" diff --cc doc/po/es.po index 19e5ce97a,ade98d9cb..bfdfd6372 --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -38,7 -38,7 +38,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2013-03-02 01:57+0000\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" ++"POT-Creation-Date: 2013-04-30 10:29+0300\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@@ -2330,6 -2330,6 +2330,13 @@@ msgstr " #. type: Content of: #: apt-key.8.xml:130 ++#, fuzzy ++#| msgid "" ++#| "Update the local keyring with the archive keyring and remove from the " ++#| "local keyring the archive keys which are no longer valid. The archive " ++#| "keyring is shipped in the archive-keyring package of " ++#| "your distribution, e.g. the debian-archive-keyring " ++#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " @@@ -2404,28 -2404,24 +2411,33 @@@ msgstr "Base de datos local de las clav #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +#, fuzzy ++#| msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: #: apt-key.8.xml:187 +#, fuzzy ++#| msgid "" ++#| "/usr/share/keyrings/debian-archive-removed-keys.gpg" msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" msgstr "" "/usr/share/keyrings/debian-archive-removed-keys.gpg" #. type: Content of: #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: diff --cc doc/po/fr.po index bbd54e103,8663c0758..5c7f521c9 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2013-03-02 01:57+0000\n" - "PO-Revision-Date: 2012-07-04 21:08-0600\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" ++"POT-Creation-Date: 2013-04-30 10:29+0300\n" + "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: fr\n" @@@ -2257,6 -2331,6 +2257,13 @@@ msgstr " #. type: Content of: #: apt-key.8.xml:130 ++#, fuzzy ++#| msgid "" ++#| "Update the local keyring with the archive keyring and remove from the " ++#| "local keyring the archive keys which are no longer valid. The archive " ++#| "keyring is shipped in the archive-keyring package of " ++#| "your distribution, e.g. the debian-archive-keyring " ++#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " @@@ -2331,28 -2405,24 +2338,33 @@@ msgstr "Base de données locale de fiab #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +#, fuzzy ++#| msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: #: apt-key.8.xml:187 +#, fuzzy ++#| msgid "" ++#| "/usr/share/keyrings/debian-archive-removed-keys.gpg" msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" msgstr "" "/usr/share/keyrings/debian-archive-removed-keys.gpg" #. type: Content of: #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy ++#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: @@@ -4829,9 -4915,9 +4851,9 @@@ msgstr " #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: - #: apt.conf.5.xml:824 + #: apt.conf.5.xml:836 msgid "" "Debug::IdentCdrom disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -5112,9 -5198,9 +5134,9 @@@ msgstr " "Le fichier &configureindex; contient un modèle de fichier montrant des " "exemples pour toutes les options existantes." -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1175 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --cc doc/po/it.po index 67f08b430,230f85b07..59a54917e --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -10,11 -11,11 +11,11 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" - "POT-Creation-Date: 2013-03-02 01:57+0000\n" - "PO-Revision-Date: 2003-04-26 23:26+0100\n" - "Last-Translator: Traduzione di Eugenia Franzoni \n" - "Language-Team: \n" - "Language: \n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" ++"POT-Creation-Date: 2013-04-30 10:29+0300\n" + "PO-Revision-Date: 2012-12-23 18:04+0200\n" + "Last-Translator: Beatrice Torracca \n" + "Language-Team: Italian \n" + "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -1582,13 -2296,18 +2296,25 @@@ msgstr " #. type: Content of: #: apt-key.8.xml:130 ++#, fuzzy ++#| msgid "" ++#| "Update the local keyring with the archive keyring and remove from the " ++#| "local keyring the archive keys which are no longer valid. The archive " ++#| "keyring is shipped in the archive-keyring package of " ++#| "your distribution, e.g. the debian-archive-keyring " ++#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the archive-keyring package of your " -"distribution, e.g. the debian-archive-keyring package in " -"Debian." +"distribution, e.g. the ubuntu-archive-keyring package in " +"Ubuntu." msgstr "" + "Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove " + "dal portachiavi locale le chiavi di archivio che non sono più valide. Il " + "portachiavi degli archivi è fornito nel pacchetto archive-keyring delle diverse distribuzioni, ad esempio il pacchetto " + "debian-archive-keyring in Debian." #. type: Content of: #: apt-key.8.xml:144 @@@ -1636,24 -2370,25 +2377,34 @@@ msgstr "Database locale di fiducia dell #. type: Content of: #: apt-key.8.xml:183 -msgid "/usr/share/keyrings/debian-archive-keyring.gpg" ++#, fuzzy ++#| msgid "/usr/share/keyrings/debian-archive-keyring.gpg" +msgid "/usr/share/keyrings/ubuntu-archive-keyring.gpg" - msgstr "" + msgstr "/usr/share/keyrings/debian-archive-keyring.gpg" #. type: Content of: #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." ++#, fuzzy ++#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." - msgstr "" + msgstr "Portachiavi delle chiavi fidate degli archivi Debian." #. type: Content of: #: apt-key.8.xml:187 ++#, fuzzy ++#| msgid "" ++#| "/usr/share/keyrings/debian-archive-removed-keys.gpg" msgid "" -"/usr/share/keyrings/debian-archive-removed-keys.gpg" +"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg" msgstr "" + "/usr/share/keyrings/debian-archive-removed-keys.gpg" #. type: Content of: #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." ++#, fuzzy ++#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." - msgstr "" + msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian." #. type: Content of: #: apt-key.8.xml:197 @@@ -7268,4 -9773,1439 +9789,1468 @@@ msgstr " # apt-get -o dir::cache::arch #. type:

#: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." - msgstr "" + msgstr "che userà gli archivi già scaricati e presenti sul disco." + + #~ msgid "Debian GNU/Linux" + #~ msgstr "Debian GNU/Linux" + + #~ msgid "OPTIONS" + #~ msgstr "OPZIONI" + + #~ msgid "None." + #~ msgstr "Nessuna." + + #~ msgid "FILES" + #~ msgstr "FILE" + + #~ msgid "" + #~ msgstr "" + + #~ msgid "" + #~ " &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + #~ msgstr "" + #~ " " + #~ " &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + + #~ msgid "" + #~ "\n" + #~ "\n" + #~ " apt.conf\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ "\n" + #~ " apt.conf\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-get\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-get\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-config\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-config\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-cdrom\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-cdrom\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-cache\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-cache\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt_preferences\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt_preferences\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-key\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-key\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-secure\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-secure\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " apt-ftparchive\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " apt-ftparchive\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " sources.list\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " sources.list\n" + #~ " 5\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " reportbug\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " reportbug\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " dpkg\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " dpkg\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " dpkg-buildpackage\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " dpkg-buildpackage\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " gzip\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " gzip\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " dpkg-scanpackages\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " dpkg-scanpackages\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " dpkg-scansources\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " dpkg-scansources\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " dselect\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " dselect\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " aptitude\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " aptitude\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " synaptic\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " synaptic\n" + #~ " 8\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " debsign\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " debsign\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " debsig-verify\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " debsig-verify\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " gpg\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " gpg\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " gnome-apt\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " gnome-apt\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ " wajig\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + #~ msgstr "" + #~ "\n" + #~ " wajig\n" + #~ " 1\n" + #~ " \"\n" + #~ ">\n" + + #~ msgid "" + #~ "\n" + #~ "\n" + #~ "
apt@packages.debian.org
\n" + #~ " \n" + #~ " Jason Gunthorpe\n" + #~ " \n" + #~ " \n" -#~ " 1998-2001 Jason Gunthorpe\n" ++#~ " 1998-2001 Jason Gunthorpe\n" + #~ " 28 October 2008\n" + #~ " Linux\n" + #~ msgstr "" + #~ "\n" + #~ "\n" + #~ "
apt@packages.debian.org
\n" + #~ " \n" + #~ " Jason Gunthorpe\n" + #~ " \n" + #~ " \n" -#~ " 1998-2001 Jason Gunthorpe\n" ++#~ " 1998-2001 Jason Gunthorpe\n" + #~ " 28 ottobre 2008\n" + #~ " Linux\n" + + #~ msgid "" + #~ " \n" + #~ "\"> \n" + #~ msgstr "" + #~ " \n" + #~ "\"> \n" + + #~ msgid "" + #~ "\n" + #~ " apt@packages.debian.org\n" + #~ " \n" + #~ "\">\n" + #~ msgstr "" + #~ "\n" + #~ " apt@packages.debian.org\n" + #~ " \n" + #~ "\">\n" + + #~ msgid "" + #~ "\n" + #~ " Jason\n" + #~ " Gunthorpe\n" + #~ " \n" + #~ " \n" + #~ "\">\n" + #~ msgstr "" + #~ "\n" + #~ " Jason\n" + #~ " Gunthorpe\n" + #~ " \n" + #~ " \n" + #~ "\">\n" + + #~ msgid "" + #~ "\n" + #~ " Mike\n" + #~ " O'Connor\n" + #~ " \n" + #~ " \n" + #~ "\">\n" + #~ msgstr "" + #~ "\n" + #~ " Mike\n" + #~ " O'Connor\n" + #~ " \n" + #~ " \n" + #~ "\">\n" + + #~ msgid "" + #~ "Linux\n" + #~ "\">\n" + #~ msgstr "" + #~ "Linux\n" + #~ "\">\n" + + #~ msgid "" + #~ "\n" + #~ " Jason Gunthorpe\n" + #~ " 1998-2001\n" + #~ " \n" + #~ "\">\n" + #~ msgstr "" + #~ "\n" + #~ " Jason Gunthorpe\n" + #~ " 1998-2001\n" + #~ "
\n" + #~ "\">\n" + + #~ msgid "" + #~ "\n" + #~ "Bugs\n" -#~ " APT bug page. \n" ++#~ " APT bug page. \n" + #~ " If you wish to report a bug in APT, please see\n" + #~ " /usr/share/doc/debian/bug-reporting.txt or the\n" + #~ " &reportbug; command.\n" + #~ " \n" + #~ "
\n" + #~ "\">\n" + #~ msgstr "" + #~ "\n" + #~ "Bachi\n" -#~ " Pagina dei bachi di APT. \n" ++#~ " Pagina dei bachi di " ++#~ "APT. \n" + #~ " Per segnalare un baco in APT, vedere\n" + #~ " /usr/share/doc/debian/bug-reporting.txt o il\n" + #~ " comando &reportbug;.\n" + #~ " \n" + #~ "
\n" + #~ "\">\n" + + #~ msgid "" + #~ " \n" + #~ " \n" + #~ " \n" -#~ " Configuration File; Specify a configuration file to use. \n" ++#~ " Configuration File; Specify a configuration file to " ++#~ "use. \n" + #~ " The program will read the default configuration file and then this \n" + #~ " configuration file. See &apt-conf; for syntax information. \n" + #~ " \n" + #~ " \n" + #~ " \n" + #~ msgstr "" + #~ " \n" + #~ " \n" + #~ " \n" -#~ " File di configurazione; Specifica un file di configurazione da usare. \n" -#~ " Il programma leggerà il file di configurazione predefinito e poi questo \n" -#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla sintassi. \n" ++#~ " File di configurazione; Specifica un file di " ++#~ "configurazione da usare. \n" ++#~ " Il programma leggerà il file di configurazione predefinito e poi " ++#~ "questo \n" ++#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla " ++#~ "sintassi. \n" + #~ " \n" + #~ " \n" + #~ " \n" + + #~ msgid "" -#~ " &cachedir;/archives/partial/\n" ++#~ " &cachedir;/archives/partial/\n" + #~ " Storage area for package files in transit.\n" -#~ " Configuration Item: Dir::Cache::Archives (implicit partial). \n" ++#~ " Configuration Item: Dir::Cache::Archives " ++#~ "(implicit partial).
\n" + #~ "
\n" + #~ "\">\n" + #~ msgstr "" -#~ " &cachedir;/archives/partial/\n" -#~ " Area di memorizzazione per i file dei pacchetti in transito.\n" -#~ " Voce di configurazione: Dir::Cache::Archives (partial implicito). \n" ++#~ " &cachedir;/archives/partial/\n" ++#~ " Area di memorizzazione per i file dei pacchetti in " ++#~ "transito.\n" ++#~ " Voce di configurazione: Dir::Cache::Archives " ++#~ "(partial implicito). \n" + #~ " \n" + #~ "\">\n" + + #~ msgid "" -#~ " &statedir;/lists/partial/\n" ++#~ " &statedir;/lists/partial/\n" + #~ " Storage area for state information in transit.\n" -#~ " Configuration Item: Dir::State::Lists (implicit partial).\n" ++#~ " Configuration Item: Dir::State::Lists (implicit " ++#~ "partial).
\n" + #~ "
\n" + #~ "\">\n" + #~ msgstr "" -#~ " &statedir;/lists/partial/\n" -#~ " Area di archiviazione per le informazioni di stato in transito.\n" -#~ " Voce di configurazione: Dir::State::Lists (partial implicito).\n" ++#~ " &statedir;/lists/partial/\n" ++#~ " Area di archiviazione per le informazioni di stato " ++#~ "in transito.\n" ++#~ " Voce di configurazione: Dir::State::Lists " ++#~ "(partial implicito).\n" + #~ " \n" + #~ "\">\n" + + #~ msgid "" + #~ msgstr "" + + #~ msgid "" -#~ "\n" + #~ "john@doe.org in 2009,\n" -#~ " 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" -#~ " Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" ++#~ " The english translation was done by John Doe john@doe.org in 2009,\n" ++#~ " 2010 and Daniela Acme daniela@acme.us in 2010 " ++#~ "together with the\n" ++#~ " Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" + #~ "\">\n" + #~ msgstr "" -#~ "\n" + #~ "eugenia@linuxcare.com nel 2000 e da Gabriele Stilli\n" + #~ " superenzima@libero.it nel 2010 insieme a\n" + #~ " chiunque vorrà unirsi (DA CORREGGERE ALLA FINE).\n" + #~ "\">\n" + + #~ msgid "" -#~ "\n" + #~ "\n" + #~ msgstr "" -#~ "\n" ++#~ "