* doc/apt-extracttemplates.1.xml:

  - debconf is not DebConf

12 files changed, 59 insertions, 46 deletions

diff --git a/debian/changelog b/debian/changelog
index 92981027e..cfe4718dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
     - correct disc vs. disk issues
   * doc/apt-config.8.xml:
     - review and fix spelling issues
+  * doc/apt-extracttemplates.1.xml:
+    - debconf is not DebConf
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
 
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 7d0f0bfea..5c4dd81d0 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -30,7 +30,7 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-extracttemplates</refname>
-    <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
+    <refpurpose>Utility to extract <command>debconf</command> config and templates from Debian packages</refpurpose>
  </refnamediv>
 
  &synopsis-command-apt-extracttemplates;
@@ -55,7 +55,7 @@
    <variablelist>
      <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
      <listitem><para>
-     Temporary directory in which to write extracted debconf template files
+     Temporary directory in which to write extracted <command>debconf</command> template files
      and config scripts.
      Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
      </varlistentry>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index b84439886..60a1a7fad 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.5.1\n"
+"Project-Id-Version: apt-doc 0.9.5.2~20120525\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-26 17:47+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"
@@ -1277,7 +1277,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1308,8 +1310,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: "
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: "
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index 85e06b1ff..2b560fc82 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1718,9 +1718,9 @@ msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
 msgstr ""
-"Hilfsprogramm zum Extrahieren der DebConf-Konfiguration und Schablonen von "
+"Hilfsprogramm zum Extrahieren der <command>debconf</command>-Konfiguration und Schablonen von "
 "Debian-Paketen"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1762,11 +1762,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
+"Temporary directory in which to write extracted <command>debconf</command> template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 "TempDir</literal>"
 msgstr ""
-"temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
+"temporäres Verzeichnis, in das die extrahierten <command>debconf</command>-Schablonendateien "
 "und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 571a884eb..65977616b 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1767,9 +1767,9 @@ msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
 msgstr ""
-"Herramienta para extraer la configuración de DebConf y las plantillas de los "
+"Herramienta para extraer la configuración de <command>debconf</command> y las plantillas de los "
 "paquetes de Debian"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1810,12 +1810,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
+"Temporary directory in which to write extracted <command>debconf</command> template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 "TempDir</literal>"
 msgstr ""
 "El directorio temporal en el que se escribirán los ficheros de plantillas "
-"debconf y los scripts de configuración extraídos. Opción de configuración: "
+"<command>debconf</command> y los scripts de configuración extraídos. Opción de configuración: "
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 7b20c1ac8..04b0cbd87 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -1726,9 +1726,9 @@ msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
 msgstr ""
-"Outil d'extraction des textes et fichiers de configuration pour DebConf "
+"Outil d'extraction des textes et fichiers de configuration pour <command>debconf</command> "
 "contenu dans un paquet Debian"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1769,12 +1769,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
+"Temporary directory in which to write extracted <command>debconf</command> template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 "TempDir</literal>"
 msgstr ""
 "Répertoire temporaire dans lequel écrire les scripts de configuration et "
-"modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
+"modèles d'écrans pour <command>debconf</command>. Élément de configuration : <literal>APT::"
 "ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/it.po b/doc/po/it.po
index 391d9068b..e9435b595 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-26 17:47+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"
@@ -1255,7 +1255,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1286,9 +1288,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 873e5ae41..331c37395 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-26 17:47+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"
@@ -1789,7 +1789,11 @@ msgstr "1"
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+#, fuzzy
+#| msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
@@ -1841,12 +1845,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
 msgstr ""
-"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
-"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
+"抽出した <command>debconf</command> テンプレートファイルや設定スクリプトを書"
+"き出す一時ディレクトリ。設定項目 - <literal>APT::ExtractTemplates::TempDir</"
+"literal>"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 7b6621f57..39988ebce 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -1820,10 +1820,10 @@ msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
 msgstr ""
 "Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony "
-"DebConf"
+"<command>debconf</command>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:39
@@ -1869,11 +1869,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
+"Temporary directory in which to write extracted <command>debconf</command> template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 "TempDir</literal>"
 msgstr ""
-"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony debconf i "
+"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony <command>debconf</command> i "
 "pliki konfiguracyjne. Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "ExtractTemplates::TempDir</literal>."
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6d8581ed0..7ba02e57c 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1723,9 +1723,9 @@ msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
 msgstr ""
-"Utilitário para extrair configurações e modelos DebConf a partir de pacotes "
+"Utilitário para extrair configurações e modelos <command>debconf</command> a partir de pacotes "
 "Debian"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1766,11 +1766,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
+"Temporary directory in which to write extracted <command>debconf</command> template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 "TempDir</literal>"
 msgstr ""
-"Directório temporário para onde escrever ficheiros debconf modelo extraídos "
+"Directório temporário para onde escrever ficheiros <command>debconf</command> modelo extraídos "
 "e scripts de configuração. Item de Configuração: <literal>APT::"
 "ExtractTemplates::TempDir</literal>"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b5c6c2e76..bcd276e97 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-26 17:47+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"
@@ -1308,7 +1308,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1339,9 +1341,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po4a.conf b/doc/po4a.conf
index c9df1f9ac..3a8d7516b 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -7,8 +7,8 @@
 	-o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <term><command>' \
 	-o break='<term><option> <term><command>' \
 	-o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <command>' \
-	-o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command>' \
-	-o translated='<para><command> <programlisting><command> <refentrytitle><command>'"
+	-o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command> <refpurpose><command>' \
+	-o translated='<para><command> <programlisting><command> <refentrytitle><command> <refpurpose><command>'"
 
 # define source file and translated file (one file per line)
 [type: man]     apt.8 $lang:$lang/apt.$lang.8