From 3b9c5cc2bdf1584525792aafe4e8f15d09951583 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Thu, 7 Oct 2010 14:50:25 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - support ArmHardFloat port in CompleteArch, thanks to Sebastian Andrzej Siewior for the patch! --- apt-pkg/deb/deblistparser.cc | 1 + debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index da8b0271b..1b3bfd6ae 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) */ static string CompleteArch(std::string& arch) { if (arch == "armel") return "linux-arm"; + if (arch == "armhf") return "linux-arm"; if (arch == "lpia") return "linux-i386"; if (arch == "powerpcspe") return "linux-powerpc"; if (arch == "uclibc-linux-armel") return "linux-arm"; diff --git a/debian/changelog b/debian/changelog index e7d784eb8..c7aead5bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,13 @@ apt (0.8.7) UNRELEASED; urgency=low * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - -- Christian Perrier Tue, 05 Oct 2010 05:35:58 +0200 + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - support ArmHardFloat port in CompleteArch, thanks to Sebastian + Andrzej Siewior for the patch! + + + -- David Kalnischkies Thu, 07 Oct 2010 14:46:59 +0200 apt (0.8.6) unstable; urgency=low -- cgit v1.2.3 From 0c1a7101fda38ad9e43ef4c6757bfc9c0191a30c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 14 Oct 2010 00:06:02 +0200 Subject: * doc/apt.ent: - move some strings into apt-verbatim.ent to avoid showing them in apt-doc.pot as they are untranslatable anyway (e.g. manpage references) --- buildlib/po4a_manpage.mak | 7 +- debian/changelog | 10 +- doc/apt-cache.8.xml | 3 + doc/apt-cdrom.8.xml | 3 + doc/apt-config.8.xml | 3 + doc/apt-extracttemplates.1.xml | 3 + doc/apt-ftparchive.1.xml | 3 + doc/apt-get.8.xml | 3 + doc/apt-key.8.xml | 3 + doc/apt-mark.8.xml | 3 + doc/apt-secure.8.xml | 3 + doc/apt-sortpkgs.1.xml | 3 + doc/apt-verbatim.ent | 188 +++ doc/apt.conf.5.xml | 3 + doc/apt.ent | 192 +-- doc/apt_preferences.5.xml | 3 + doc/po/apt-doc.pot | 2165 ++++++++++++++------------------- doc/po/de.po | 2591 ++++++++++++++++------------------------ doc/po/es.po | 2377 +++++++++++++++--------------------- doc/po/fr.po | 2377 +++++++++++++++--------------------- doc/po/it.po | 2209 +++++++++++++++------------------- doc/po/ja.po | 2377 +++++++++++++++--------------------- doc/po/pl.po | 2375 +++++++++++++++--------------------- doc/po/pt.po | 2377 +++++++++++++++--------------------- doc/po/pt_BR.po | 2213 +++++++++++++++------------------- doc/sources.list.5.xml | 3 + 26 files changed, 8771 insertions(+), 12726 deletions(-) create mode 100644 doc/apt-verbatim.ent diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 11dc11d28..404bb57a5 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -11,7 +11,7 @@ # generate a list of accepted man page translations SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) -INCLUDES = apt.ent +INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -25,6 +25,9 @@ $(LOCAL)-LIST := $(SOURCE) doc: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) +apt-verbatim.ent: ../apt-verbatim.ent + cp ../apt-verbatim.ent . + $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? @@ -34,7 +37,7 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) # Clean rule .PHONY: veryclean/$(LOCAL) veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \ + -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \ $(addsuffix .xml,$($(@F)-LIST)) \ offline.$(LC).sgml guide.$(LC).sgml diff --git a/debian/changelog b/debian/changelog index 9126e9dc3..1eab8cf7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,10 @@ apt (0.8.7) UNRELEASED; urgency=low * Another typo fixed in French ("Anfin"). Thanks to bubulle * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - + [ Michael Vogt ] * debian/apt.cron.daily: - - source /etc/default/locale (if available) so that the + - source /etc/default/locale (if available) so that the apt-get update cron job fetches the right translated package descriptions * fix test failure on amd64 @@ -30,9 +30,11 @@ apt (0.8.7) UNRELEASED; urgency=low * apt-pkg/deb/deblistparser.cc: - support ArmHardFloat port in CompleteArch, thanks to Sebastian Andrzej Siewior for the patch! + * doc/apt.ent: + - move some strings into apt-verbatim.ent to avoid showing them in + apt-doc.pot as they are untranslatable anyway (e.g. manpage references) - - -- David Kalnischkies Thu, 07 Oct 2010 14:46:59 +0200 + -- David Kalnischkies Thu, 14 Oct 2010 00:05:53 +0200 apt (0.8.6) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9a63421a8..359d210ea 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 423569fc1..53ab392ab 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index d4d36891f..862a034a1 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 9f8a4056d..af4cacfce 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 549aa6a34..852da8ad1 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index abdec96c1..57306c03f 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 8f445b7f9..f1cc3ac02 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 8e07cd7d9..ec50d6f76 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 908fc342f..f345c3f89 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index a71766984..f2bd3c3ea 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent new file mode 100644 index 000000000..8b3734f6c --- /dev/null +++ b/doc/apt-verbatim.ent @@ -0,0 +1,188 @@ + + + + + +&docdir;examples/configure-index.gz"> +/etc/apt.conf"> + + + + + + apt.conf + 5 + " +> + + + apt-get + 8 + " +> + + + apt-config + 8 + " +> + + + apt-cdrom + 8 + " +> + + + apt-cache + 8 + " +> + + + apt_preferences + 5 + " +> + + + apt-key + 8 + " +> + + + apt-secure + 8 + " +> + + + apt-ftparchive + 1 + " +> + + + + sources.list + 5 + " +> + + + reportbug + 1 + " +> + + + dpkg + 1 + " +> + + + dpkg-buildpackage + 1 + " +> + + + gzip + 1 + " +> + + + dpkg-scanpackages + 1 + " +> + + + dpkg-scansources + 1 + " +> + + + dselect + 1 + " +> + + + aptitude + 8 + " +> + + + synaptic + 8 + " +> + + + debsign + 1 + " +> + + + debsig-verify + 1 + " +> + + + gpg + 1 + " +> + + + wajig + 1 + " +> + + + + apt@packages.debian.org + +"> + + + Jason + Gunthorpe + + +"> + + + Mike + O'Connor + + +"> + + + Jason Gunthorpe + 1998-2001 + +"> + +Linux +"> + + + + + diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e37456d73..f00baacea 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt.ent b/doc/apt.ent index 0d037c8bb..fc745989f 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -1,153 +1,5 @@ - - - -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> - - - - - - apt.conf - 5 - " -> - - - apt-get - 8 - " -> - - - apt-config - 8 - " -> - - - apt-cdrom - 8 - " -> - - - apt-cache - 8 - " -> - - - apt_preferences - 5 - " -> - - - apt-key - 8 - " -> - - - apt-secure - 8 - " -> - - - apt-ftparchive - 1 - " -> - - - - sources.list - 5 - " -> - - - reportbug - 1 - " -> - - - dpkg - 1 - " -> - - - dpkg-buildpackage - 1 - " -> - - - gzip - 1 - " -> - - - dpkg-scanpackages - 1 - " -> - - - dpkg-scansources - 1 - " -> - - - dselect - 1 - " -> - - - aptitude - 8 - " -> - - - synaptic - 8 - " -> - - - debsign - 1 - " -> - - - debsig-verify - 1 - " -> - - - gpg - 1 - " -> - - - wajig - 1 - " -> - @@ -159,30 +11,7 @@ 1998-2001 Jason Gunthorpe 28 October 2008 Linux - -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - - -"> - - - Mike - O'Connor - - "> "> -Linux -"> - - - Jason Gunthorpe - 1998-2001 - -"> - -Linux -"> - QA Page @@ -216,7 +30,7 @@ Bugs - APT bug page. + APT bug page. If you wish to report a bug in APT, please see /usr/share/doc/debian/bug-reporting.txt or the &reportbug; command. @@ -394,7 +208,3 @@ This is done on purpose, to avoid losing content when the translation is lagging behind the original content. "> - - - - diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index abcf56744..54c01100c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 60c795481..8365c460f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-23 18:46-0300\n" +"POT-Creation-Date: 2010-10-14 00:03+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. type: TH #: apt.8:17 @@ -147,271 +148,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" " -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -426,55 +163,12 @@ msgid "" "Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap 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" @@ -535,7 +207,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -556,6 +171,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28. Oktober 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap 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" @@ -726,7 +249,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -588,6 +203,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 de Octubre de 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap 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" @@ -758,7 +281,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -778,7 +301,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -564,6 +179,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Octobre 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap 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" @@ -734,7 +257,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -754,7 +277,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -428,55 +164,12 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap 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" @@ -536,7 +208,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -576,6 +191,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" " \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap 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" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -766,7 +289,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -570,6 +185,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 października 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap 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" @@ -741,7 +264,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -761,7 +284,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -558,6 +173,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Outubro 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap 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" @@ -728,7 +251,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -748,7 +271,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, fuzzy, no-wrap msgid "" "\n" @@ -444,6 +180,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" " \n" @@ -454,52 +192,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap 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" @@ -566,7 +238,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, fuzzy, no-wrap msgid "" "\n" @@ -584,7 +256,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" " - - - + + + -- cgit v1.2.3 From 8b35a3aca210c54dd86a2b1cb2b3dfb717c94205 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 15 Oct 2010 09:18:45 +0200 Subject: * doc/examples/apt-https-method-example.conf: - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) --- debian/changelog | 4 +++- doc/examples/apt-https-method-example.conf | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3af649d6..7da80ca4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,8 +35,10 @@ apt (0.8.7) UNRELEASED; urgency=low apt-doc.pot as they are untranslatable anyway (e.g. manpage references) * doc/apt-verbatim.ent: - change the codenames to reflect the situation after squeeze release + * doc/examples/apt-https-method-example.conf: + - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) - -- David Kalnischkies Thu, 14 Oct 2010 00:07:20 +0200 + -- David Kalnischkies Fri, 15 Oct 2010 09:15:53 +0200 apt (0.8.6) unstable; urgency=low diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index cc7889044..a03766746 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -6,7 +6,7 @@ This example file starts with a common setup that voluntarily exhibits all available configurations knobs with simple comments. Extended comments on the behavior of the option is provided at the end for - better readibility. As a matter of fact, a common configuration file + better readability. As a matter of fact, a common configuration file will certainly contain far less elements and benefit of default values for many parameters. @@ -38,12 +38,12 @@ matches their respective DNS names. - We have CRL available for both dom1.tld and dom2.tld PKI, and intend to use them. - - It somtimes happens that we had other more generic https available + - It sometimes happens that we had other more generic https available repository to our list. We want the checks to be performed against a common list of anchors (like the one provided by ca-certificates package for instance) - The sample configuration below basically covers those simpe needs. + The sample configuration below basically covers those simple needs. */ @@ -168,12 +168,12 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; When the option is set to "SSLv3" to have apt propose SSLv3 (and associated sets of ciphersuites) instead of TLSv1 (the default) when performing the exchange. This prevents the server to select - TLSv1 and use associated cipheruites. You should probably not use + TLSv1 and use associated ciphersuites. You should probably not use this option except if you know exactly what you are doing. Note that the default setting does not guarantee that the server will not select SSLv3 (for ciphersuites and SSL/TLS version as - selectio is always done by the server, in the end). It only means + selection is always done by the server, in the end). It only means that apt will not advertise TLS support. Debug::Acquire::https "true"; -- cgit v1.2.3 From 915f0520645f68dda1aea1ddfd7e7a413e1f3e09 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 15 Oct 2010 17:54:36 +0200 Subject: add test case for having no indexes, and fix regression in that case --- apt-pkg/deb/debindexfile.cc | 44 +++++++++++++++++++++++++++++++++++--------- test/test-indexes.sh | 8 ++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index a89a2574f..af1209ccb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -149,11 +149,20 @@ bool debSourcesIndex::Exists() const /* */ unsigned long debSourcesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ @@ -269,11 +278,20 @@ bool debPackagesIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debPackagesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ // PackagesIndex::Merge - Load the index file into a cache /*{{{*/ @@ -460,12 +478,20 @@ bool debTranslationsIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debTranslationsIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); - return f.Size(); + return size; } /*}}}*/ // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ diff --git a/test/test-indexes.sh b/test/test-indexes.sh index dad3e1fb2..17363718d 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -135,6 +135,14 @@ echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list echo "RootDir \"$WORKDIR\";" > apt_config export APT_CONFIG=`pwd`/apt_config +echo "==== no indexes ====" +echo '--- apt-get check works without indexes' +[ -z `$APT_GET check` ] +echo '--- apt-cache policy works without indexes' +$APT_CACHE policy bash >/dev/null +echo '--- apt-cache show works without indexes' +! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found' + echo "===== uncompressed indexes =====" check_update check_indexes -- cgit v1.2.3 From 95fe33dc131bee1a0917ba647e44855c10083ab5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 15 Oct 2010 18:28:03 +0200 Subject: releasing version 0.8.7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7da80ca4f..5ff165cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.7) UNRELEASED; urgency=low +apt (0.8.7) unstable; urgency=low [ Manpages translations ] * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau. @@ -38,7 +38,7 @@ apt (0.8.7) UNRELEASED; urgency=low * doc/examples/apt-https-method-example.conf: - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) - -- David Kalnischkies Fri, 15 Oct 2010 09:15:53 +0200 + -- Michael Vogt Fri, 15 Oct 2010 18:16:10 +0200 apt (0.8.6) unstable; urgency=low -- cgit v1.2.3