releasing version 0.9.30.9.3

11 files changed, 330 insertions, 72 deletions

diff --git a/configure.in b/configure.in
index e993c7f4e..592c7dcb0 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.2"
+PACKAGE_VERSION="1.5"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 3e36f0fa8..ba660b726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.9.3) UNRELEASED; urgency=low
+apt (0.9.3) unstable; urgency=low
 
   [ David Kalnischkies ]
   * apt-pkg/contrib/strutl.cc:
@@ -55,7 +55,7 @@ apt (0.9.3) UNRELEASED; urgency=low
     - readd 'md5.h' to the uncleaned header includes to make qapt build
       against us again unchanged to unblock transition (Closes: #669163)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 07 May 2012 21:12:23 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 11 May 2012 17:16:22 +0200
 
 apt (0.9.2) unstable; urgency=low
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fee898f3c..fe4f6b497 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-20 14:20+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1256,7 +1256,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
@@ -1271,7 +1271,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
 msgid "See Also"
 msgstr ""
 
@@ -1281,7 +1281,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
@@ -1568,13 +1568,42 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+msgid "<option>--empty</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use "
+"--no-empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f "
+"&#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
diff --git a/doc/po/de.po b/doc/po/de.po
index 5d65eea0c..040baac57 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.8.15-9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1605,7 +1605,7 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1623,7 +1623,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1637,7 +1637,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -1998,14 +1998,45 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>-y</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>-y</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
diff --git a/doc/po/es.po b/doc/po/es.po
index 5e554b70d..542926fbf 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1651,7 +1651,7 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1669,7 +1669,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1683,7 +1683,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -2047,14 +2047,45 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>--help</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -11651,9 +11682,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ msgid "<option>-h</option>"
 #~ msgstr "<option>-h</option>"
 
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Muestra un breve resumen de uso."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 09c902135..e57b45907 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1605,7 +1605,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1623,7 +1623,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1637,7 +1637,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -2001,14 +2001,45 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>--help</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -11627,9 +11658,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "<option>-h</option>"
 #~ msgstr "<option>-h</option>"
 
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Affiche un résumé de l'aide"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 1e2342f7b..558999e96 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -1226,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1244,7 +1244,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1258,7 +1258,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -1548,14 +1548,43 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+msgid "<option>--empty</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6c896981d..dce950e93 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1654,7 +1654,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1674,7 +1674,7 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1690,7 +1690,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -2071,16 +2071,47 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>--help</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -11252,9 +11283,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する�
 #~ msgid "<option>-h</option>"
 #~ msgstr "<option>-h</option>"
 
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show a short usage summary."
 #~ msgstr "短い使用方法を表示します。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c8140963b..54d5265db 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1687,7 +1687,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1705,7 +1705,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1720,7 +1720,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -2104,15 +2104,46 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>--help</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -10518,9 +10549,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "<option>-h</option>"
 #~ msgstr "<option>-h</option>"
 
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
 #
 #~ msgid "Show a short usage summary."
 #~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 7759b2503..84ebf0735 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1602,7 +1602,7 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1620,7 +1620,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1634,7 +1634,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -1994,14 +1994,45 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+#, fuzzy
+#| msgid "<option>--help</option>"
+msgid "<option>--empty</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -11529,9 +11560,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ msgid "<option>-h</option>"
 #~ msgstr "<option>-h</option>"
 
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Mostra um curto sumário de utilização."
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 97aa49c33..3ada38fca 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2012-04-17 09:28+0300\n"
+"POT-Creation-Date: 2012-05-11 17:16+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1279,7 +1279,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:103
 #: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
@@ -1297,7 +1297,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:108
 #: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
@@ -1312,7 +1312,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:113
 #: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
@@ -1603,8 +1603,37 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:89
+msgid "<option>--empty</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-config.8.xml:95
+msgid ""
+"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
+"n</replaceable>'</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the tagname, &percnt;f with the complete tagname and &percnt;v with the "
+"value of the option.  Use uppercase letters and the respective values will "
+"be quoted. Additionally &percnt;n will be replaced by a newline, &percnt;N "
+"by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 #, fuzzy
 msgid "&apt-conf;"
@@ -1614,7 +1643,7 @@ msgstr ""
 " "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#: apt-config.8.xml:114
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."