From: taffit <taffit@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Tue, 10 Jan 2012 21:59:42 +0000 (+0000)
Subject: Update POT and PO files (after fixing #655153)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=79504b056c1879535cfa598fa5ad2c301efb8ca4

Update POT and PO files (after fixing #655153)

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@9031 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/po4a/de/best-pkging-practices.po b/po4a/de/best-pkging-practices.po
index 9bd3df7..1a23868 100755
--- a/po4a/de/best-pkging-practices.po
+++ b/po4a/de/best-pkging-practices.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.4\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:48-0400\n"
 "PO-Revision-Date: 2011-10-04 18:06+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1738,218 +1738,106 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:833
 msgid ""
-"To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
-"first method does <emphasis>preventive</emphasis> search and replace actions "
-"in the PO files. The latter uses <command>gettext</command> utilities to "
-"<emphasis>unfuzzy</emphasis> strings."
+"To <emphasis>unfuzzy</emphasis> translations, you can use "
+"<command>msguntypot</command> (part of the <systemitem role=\"package"
+"\">po4a</systemitem> package)."
 msgstr ""
-"Um aus Übersetzungen <emphasis>Fuzzy-Markierungen zu entfernen</emphasis>, "
-"können Sie nach zwei Methoden verfahren. Bei der ersten Methode werden "
-"<emphasis>präventiv</emphasis> Such- und Ersetzungsaktionen in den PO-"
-"Dateien durchgeführt. Letztere benutzt <command>gettext</command>-"
-"Hilfswerkzeuge, um aus Zeichenketten <emphasis>Fuzzy-Markierungen zu "
-"entfernen</emphasis>."
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:839
-msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
-msgstr ""
-"Methode <emphasis>Fuzzy-Markierungen präventiv zu entfernen</emphasis>:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:844
-msgid ""
-"Try finding a complete translation file <emphasis role=\"strong\">before</"
-"emphasis> the change:"
+#: best-pkging-practices.dbk:840
+msgid "Regenerate the POT and PO files."
 msgstr ""
-"Versuchen Sie eine vollständige Übersetzungsdatei <emphasis role=\"strong"
-"\">vor</emphasis> der Änderung zu finden:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:918
+#: best-pkging-practices.dbk:842 best-pkging-practices.dbk:865
 #, no-wrap
-msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:849
-msgid ""
-"The file only showing <emphasis>translated</emphasis> items will be used as "
-"the reference file. If there is none (which should not happen if you take "
-"care to properly interact with translators), you should use the file with "
-"the most translated strings."
+msgid "debconf-updatepo"
 msgstr ""
-"Die Datei, die nur <emphasis>übersetzte</emphasis> Elemente anzeigt, wird "
-"als Bezugsdatei benutzt. Falls es keine gibt (was nicht vorkommen sollte, "
-"falls Sie auf ein fachgerechtes Zusammenspiel mit Übersetzern achten), "
-"sollten Sie die Datei mit den meisten übersetzten Zeichenketten benutzen."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:857
-msgid ""
-"Identify the needed change. In this example, let's assume the change is "
-"about fixing a typo in the word <literal>typo</literal> which was "
-"inadvertently written as <literal>tpyo</literal>. Therefore, the change is "
-"<command>s/tpyo/typo</command>."
+#: best-pkging-practices.dbk:846
+msgid "Make a copy of the POT file."
 msgstr ""
-"Finden Sie heraus, welche Änderung nötig ist. In diesem Beispiel wird davon "
-"ausgegangen, dass die Änderung darin besteht, einen Tippfehler im Wort "
-"<literal>typo</literal> zu korrigieren, das versehentlich <literal>tpyo</"
-"literal> geschrieben wurde. Daher ist die Änderung <command>s/tpyo/typo</"
-"command>."
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:865
-msgid ""
-"Check that this change is only applied to the place where you really intend "
-"to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
-"where the original string is appropriate. This specifically applies to "
-"change in punctuation, for instance."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:848
+#, no-wrap
+msgid "cp templates.pot templates.pot.orig"
 msgstr ""
-"Prüfen Sie, ob die Änderung nur an der Stelle angewandt wird, an der Sie sie "
-"wirklich vornehmen möchten und <emphasis role=\"strong\">nicht</emphasis> an "
-"irgendeiner anderen Stelle, an der die Originalzeichenkette so gewollt ist. "
-"Dies wird beispielsweise eigens bei der Änderung der Zeichensetzung "
-"angewandt."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:873
-msgid ""
-"Modify all PO files by using <command>sed</command>. The use of that command "
-"is recommended over any text editor to guarantee that the files encoding "
-"will not be broken by the edit action:"
+#: best-pkging-practices.dbk:852
+msgid "Make a copy of all the PO files."
 msgstr ""
-"Ändern Sie alle PO-Dateien mittels <command>sed</command>. Es wird "
-"empfohlen, diesen Befehl über einen Text-Editor zu benutzen, um zu "
-"gewährleisten, dass die Zeichencodierung der Datei nicht durch die "
-"Bearbeitungsaktion zerstört wird:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:878
+#: best-pkging-practices.dbk:854
 #, no-wrap
-msgid ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+msgid "mkdir po_fridge; cp *.po po_fridge"
 msgstr ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:884
-msgid "Change the debconf template file to fix the typo."
+#: best-pkging-practices.dbk:858
+#, fuzzy
+#| msgid "Change the debconf template file to fix the typo."
+msgid "Change the debconf template files to fix the typos."
 msgstr "Ändern Sie die Debconf-Schablone, um den Tippfehler zu korrigieren."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:889
-msgid "Run <command>debconf-updatepo</command>."
-msgstr "Führen Sie <command>debconf-updatepo</command> aus."
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:894
-msgid ""
-"Check the <filename>foo.po</filename> reference file. Its statistics should "
-"not be changed:"
+#: best-pkging-practices.dbk:863
+msgid "Regenerate the POT and PO files (again)."
 msgstr ""
-"Prüfen Sie die Bezugsdatei <filename>foo.po</filename>. Die Statistik dieser "
-"Datei sollte unverändert sein:"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:898
-#, no-wrap
-msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
-msgstr "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:903
+#: best-pkging-practices.dbk:867
 msgid ""
-"If the file's statistics changed, you did something wrong. Try again or ask "
-"for help on the &email-debian-i18n; mailing list."
+"At this point, the typo fix fuzzied all the translations, and this "
+"unfortunate change is the only one between the PO files of your main "
+"directory and the one from the fridge. Here is how to solve this."
 msgstr ""
-"Falls sich die Statistik dieser Datei geändert hat, haben Sie etwas falsch "
-"gemacht. Versuchen Sie es erneut oder bitten Sie auf der Mailingliste &email-"
-"debian-i18n; um Hilfe."
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:909
-msgid "Gettext utilities method:"
-msgstr "Methode mit Gettext-Hilfswerkzeugen:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:914
-msgid ""
-"Put all incomplete PO files out of the way.  You can check the completeness "
-"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
-"package installed):"
+#: best-pkging-practices.dbk:874
+msgid "Discard fuzzy translation, restore the ones from the fridge."
 msgstr ""
-"Räumen Sie alle unvollständigen PO-Dateien aus dem Weg. Sie können die "
-"Vollständigkeit prüfen (das Paket <systemitem role=\"package\">gettext</"
-"systemitem> muss installiert sein):"
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:922
-msgid ""
-"Move all files which report either fuzzy strings to a temporary place.  "
-"Files which report no fuzzy strings (only translated and untranslated) will "
-"be kept in place."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:876
+#, no-wrap
+msgid "cp po_fridge/*.po ."
 msgstr ""
-"Verschieben Sie alle Dateien, die auch unvollständige Zeichenketten "
-"enthalten temporär an eine andere Stelle. Dateien ohne unvollständige "
-"Zeichenketten (nur übersetzt und unübersetzte) bleiben wo sie sind."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:929
+#: best-pkging-practices.dbk:880
 msgid ""
-"Now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
-"for the typos and check again that translation are not impacted (typos, "
-"spelling errors, sometimes typographical corrections are usually OK)."
+"Manually merge the PO files with the new POT file, but taking the useless "
+"fuzzy into account."
 msgstr ""
-"Ändern sie nun <emphasis role=\"strong\">und nur nun</emphasis> die "
-"Tippfehler in der Schablone und prüfen Sie erneut, ob keine Übersetzungen "
-"betroffen sind (normalerweise sind Tippfehler, Rechtschreibfehler und "
-"manchmal typografische Korrekturen OK)."
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:936
-msgid ""
-"Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
-"modified in translations.  You can see this by running the above again."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:882
+#, no-wrap
+msgid "msguntypot -o templates.pot.orig -n templates.pot *.po"
 msgstr ""
-"Führen Sie <command>debconf-updatepo</command> aus. Dies wird alle von Ihnen "
-"in Übersetzungen geänderten Zeichenketten mit »fuzzy« markieren. Sie können "
-"dies sehen, wenn Sie obigen Aufruf erneut ausführen."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:942
-msgid "Use the following command:"
-msgstr "Benutzen Sie den folgenden Befehl:"
+#: best-pkging-practices.dbk:886
+msgid "Clean up."
+msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:944
+#: best-pkging-practices.dbk:888
 #, no-wrap
-msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:948
-msgid ""
-"Move back to <filename>debian/po</filename> the files which showed fuzzy "
-"strings in the first step."
+msgid "rm -rf templates.pot.orig po_fridge"
 msgstr ""
-"Verschieben Sie die Dateien mit unvollständige Zeichenketten aus dem ersten "
-"Schritt zurück nach <filename>debian/po</filename>."
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:953
-msgid "Run <command>debconf-updatepo</command> again."
-msgstr "Führen Sie erneut <command>debconf-updatepo</command> aus."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:960
+#: best-pkging-practices.dbk:894
 msgid "Do not make assumptions about interfaces"
 msgstr "Treffen Sie keine Annahmen über Schnittstellen."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:962
+#: best-pkging-practices.dbk:896
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer Yes...</"
@@ -1963,7 +1851,7 @@ msgstr ""
 "verwenden."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:901
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
@@ -1977,7 +1865,7 @@ msgstr ""
 "Datenbank vorbelegt war)."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:907
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
@@ -1986,12 +1874,12 @@ msgstr ""
 "vermeiden. Geben Sie nur Tatsachen wieder."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:979
+#: best-pkging-practices.dbk:913
 msgid "Do not use first person"
 msgstr "Reden Sie nicht in der ersten Person."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:981
+#: best-pkging-practices.dbk:915
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 "emphasis> or <emphasis>We recommend...</emphasis>).  The computer is not a "
@@ -2013,12 +1901,12 @@ msgstr ""
 "<emphasis>This can be enabled if...</emphasis>."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:991
+#: best-pkging-practices.dbk:925
 msgid "Be gender neutral"
 msgstr "Formulieren Sie geschlechtsneutral"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:993
+#: best-pkging-practices.dbk:927
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
@@ -2027,12 +1915,12 @@ msgstr ""
 "Texten geschlechtsneutrale Formulierungen."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1001
+#: best-pkging-practices.dbk:935
 msgid "Templates fields definition"
 msgstr "Definition von Schablonenfeldern"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1003
+#: best-pkging-practices.dbk:937
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
@@ -2044,17 +1932,17 @@ msgstr ""
 
 # Nicht übersetzen --> siehe Manpage aus letztem String
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1008
+#: best-pkging-practices.dbk:942
 msgid "Type"
 msgstr "Type"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1010
+#: best-pkging-practices.dbk:944
 msgid "string"
 msgstr "string"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1012
+#: best-pkging-practices.dbk:946
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
@@ -2062,12 +1950,12 @@ msgstr ""
 "Zeichenkette eingeben kann."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1017
+#: best-pkging-practices.dbk:951
 msgid "password"
 msgstr "password"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1019
+#: best-pkging-practices.dbk:953
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
@@ -2080,12 +1968,12 @@ msgstr ""
 "ist."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1026
+#: best-pkging-practices.dbk:960
 msgid "boolean"
 msgstr "boolean"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:962
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
@@ -2094,12 +1982,12 @@ msgstr ""
 "role=\"strong\">yes/no</emphasis> ..."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1034
+#: best-pkging-practices.dbk:968
 msgid "select"
 msgstr "select"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1036
+#: best-pkging-practices.dbk:970
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
@@ -2111,7 +1999,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1041
+#: best-pkging-practices.dbk:975
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
@@ -2123,7 +2011,7 @@ msgstr ""
 "separate Zeichenkette heraustrennen."
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1046
+#: best-pkging-practices.dbk:980
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
@@ -2134,7 +2022,7 @@ msgstr ""
 "Auswahlmöglichkeiten als übersetzbar zu kennzeichnen. Ein Beispiel:"
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
-#: best-pkging-practices.dbk:1051
+#: best-pkging-practices.dbk:985
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
@@ -2152,7 +2040,7 @@ msgstr ""
 " Please choose the TV standard used in your country.\n"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1059
+#: best-pkging-practices.dbk:993
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
@@ -2163,7 +2051,7 @@ msgstr ""
 "ermöglicht, dass nur »Other« in die POT- und PO-Dateien eingefügt wird."
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1064
+#: best-pkging-practices.dbk:998
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>7</"
@@ -2175,12 +2063,12 @@ msgstr ""
 "Möglichkeiten auf."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1072
+#: best-pkging-practices.dbk:1006
 msgid "multiselect"
 msgstr "multiselect"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1008
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
@@ -2189,12 +2077,12 @@ msgstr ""
 "Elementen aus der Auswahlliste auswählen kann (oder gar keins)."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1080
+#: best-pkging-practices.dbk:1014
 msgid "note"
 msgstr "note"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1082
+#: best-pkging-practices.dbk:1016
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
@@ -2210,22 +2098,22 @@ msgstr ""
 "manchen Fällen eine Benachrichtigung per E-Mail bekommt."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1091
+#: best-pkging-practices.dbk:1025
 msgid "text"
 msgstr "text"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1093
+#: best-pkging-practices.dbk:1027
 msgid "This type is now considered obsolete: don't use it."
 msgstr "Dieser Typ wird nun als veraltet angesehen: Benutzen Sie ihn nicht."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1098
+#: best-pkging-practices.dbk:1032
 msgid "error"
 msgstr "error"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1100
+#: best-pkging-practices.dbk:1034
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
@@ -2237,7 +2125,7 @@ msgstr ""
 "üblichen blauen Bildschirms)."
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1105
+#: best-pkging-practices.dbk:1039
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
@@ -2247,12 +2135,12 @@ msgstr ""
 "ziehen muss."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1047
 msgid "Description: short and extended description"
 msgstr "Description: Kurze und längere Beschreibung"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1115
+#: best-pkging-practices.dbk:1049
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
@@ -2261,7 +2149,7 @@ msgstr ""
 "Kurzbeschreibung steht in der Zeile »Description:« der Schablone."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1053
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accommodated by most debconf interfaces.  Keeping it short also helps "
@@ -2274,7 +2162,7 @@ msgstr ""
 "normalerweise dazu neigen, länger als das Original zu sein."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1059
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
@@ -2287,7 +2175,7 @@ msgstr ""
 "Vermeiden Sie Dinge wie »Was möchten Sie tun?«"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1131
+#: best-pkging-practices.dbk:1065
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
@@ -2297,7 +2185,7 @@ msgstr ""
 "Empfehlungen."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1135
+#: best-pkging-practices.dbk:1069
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
@@ -2313,7 +2201,7 @@ msgstr ""
 "leer."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1142
+#: best-pkging-practices.dbk:1076
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
@@ -2325,7 +2213,7 @@ msgstr ""
 "anderen Absatz."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1081
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
@@ -2338,7 +2226,7 @@ msgstr ""
 "Dialogfenster nicht scrollen müssen und viele Leute tun das einfach nicht."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1153
+#: best-pkging-practices.dbk:1087
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
@@ -2347,7 +2235,7 @@ msgstr ""
 "Frage enthalten."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1091
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
@@ -2356,12 +2244,12 @@ msgstr ""
 "boolean etc.) abhängen, lesen Sie das Folgende."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1163
+#: best-pkging-practices.dbk:1097
 msgid "Choices"
 msgstr "Choices"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1165
+#: best-pkging-practices.dbk:1099
 msgid ""
 "This field should be used for select and multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
@@ -2372,12 +2260,12 @@ msgstr ""
 "Auswahlmöglichkeiten sollten durch Kommas getrennt werden."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1172
+#: best-pkging-practices.dbk:1106
 msgid "Default"
 msgstr "Default"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1174
+#: best-pkging-practices.dbk:1108
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
@@ -2388,17 +2276,17 @@ msgstr ""
 "Schablonen könnte es eine durch Kommas getrennte Auswahlliste enthalten."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1183
+#: best-pkging-practices.dbk:1117
 msgid "Templates fields specific style guide"
 msgstr "Stil-Anleitung speziell für Schablonenfelder"
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1185
+#: best-pkging-practices.dbk:1119
 msgid "Type field"
 msgstr "Feld »Type«"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1121
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
@@ -2407,12 +2295,12 @@ msgstr ""
 "den vorhergehenden Abschnitt."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1127
 msgid "Description field"
 msgstr "Feld »Description«"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1195
+#: best-pkging-practices.dbk:1129
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
@@ -2421,12 +2309,12 @@ msgstr ""
 "Beschreibung (kurz und länger), abhängig vom Schablonentyp."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1199
+#: best-pkging-practices.dbk:1133
 msgid "String/password templates"
 msgstr "»string«-/»password«-Schablonen"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1203
+#: best-pkging-practices.dbk:1137
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "
@@ -2438,7 +2326,7 @@ msgstr ""
 "benutzen."
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1210
+#: best-pkging-practices.dbk:1144
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
@@ -2451,12 +2339,12 @@ msgstr ""
 "knappem Schreibstil wird strikt abgeraten."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1220
+#: best-pkging-practices.dbk:1154
 msgid "Boolean templates"
 msgstr "»boolean«-Schablonen"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1224
+#: best-pkging-practices.dbk:1158
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
@@ -2470,7 +2358,7 @@ msgstr ""
 "sind.)"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1232
+#: best-pkging-practices.dbk:1166
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
@@ -2480,12 +2368,12 @@ msgstr ""
 "Sie Ja-Typ-Konstruktionen antworten."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1240
+#: best-pkging-practices.dbk:1174
 msgid "Select/Multiselect"
 msgstr "»select«/»multiselect«"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1244
+#: best-pkging-practices.dbk:1178
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "
@@ -2498,7 +2386,7 @@ msgstr ""
 "herauszufinden, dass sie etwas auswählen sollen ... :)"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1252
+#: best-pkging-practices.dbk:1186
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
@@ -2512,12 +2400,12 @@ msgstr ""
 "Schablone handelt."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1262
+#: best-pkging-practices.dbk:1196
 msgid "Notes"
 msgstr "»notes«"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1266
+#: best-pkging-practices.dbk:1200
 msgid ""
 "The short description should be considered to be a <emphasis role=\"strong"
 "\">title</emphasis>."
@@ -2526,7 +2414,7 @@ msgstr ""
 "betrachtet werden."
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1205
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
@@ -2535,7 +2423,7 @@ msgstr ""
 "angezeigt wird. Sätze, kein knapper Schreibstil."
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1277
+#: best-pkging-practices.dbk:1211
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
@@ -2557,12 +2445,12 @@ msgstr ""
 "umzuwandeln und existierende Übersetzungen für die Zukunft aufzubewahren."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1292
+#: best-pkging-practices.dbk:1226
 msgid "Choices field"
 msgstr "Das Feld »Choices«"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1294
+#: best-pkging-practices.dbk:1228
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
@@ -2574,12 +2462,12 @@ msgstr ""
 "wird."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1235 best-pkging-practices.dbk:1273
 msgid "Default field"
 msgstr "Das Feld »Default«"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1303
+#: best-pkging-practices.dbk:1237
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
@@ -2591,7 +2479,7 @@ msgstr ""
 "Trick."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1242
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
@@ -2604,12 +2492,12 @@ msgstr ""
 "wird, wenn Sie Englisch benutzen."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1314
+#: best-pkging-practices.dbk:1248
 msgid "Example, taken from the geneweb package templates:"
 msgstr "Ein Beispiel aus den Schablonen des Pakets Geneweb:"
 
 #. type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:1317
+#: best-pkging-practices.dbk:1251
 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
@@ -2633,7 +2521,7 @@ msgstr ""
 "_Description: Geneweb default language:\n"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1328
+#: best-pkging-practices.dbk:1262
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
@@ -2644,7 +2532,7 @@ msgstr ""
 "Dateien zu sehen sein wird, mit denen Übersetzer arbeiten."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1267
 msgid ""
 "The comments are needed as the _Default trick is a bit confusing: the "
 "translators may put their own choice"
@@ -2653,7 +2541,7 @@ msgstr ""
 "ist: Die Übersetzer könnten ihre eigene Auswahl nehmen."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1341
+#: best-pkging-practices.dbk:1275
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
@@ -2662,7 +2550,7 @@ msgstr ""
 "benutzen möchten, benutzen Sie Default überhaupt nicht."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1345
+#: best-pkging-practices.dbk:1279
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see <xref linkend=\"s6.5.2.2\"/>), consider making this field translatable, "
@@ -2674,7 +2562,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1350
+#: best-pkging-practices.dbk:1284
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
@@ -2688,12 +2576,12 @@ msgstr ""
 "citerefentry> dokumentiert wird."
 
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1362
+#: best-pkging-practices.dbk:1296
 msgid "Internationalization"
 msgstr "Internationalisierung"
 
 #. type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:1364
+#: best-pkging-practices.dbk:1298
 msgid ""
 "This section contains global information for developers to make translators' "
 "life easier.  More information for translators and developers interested in "
@@ -2707,12 +2595,12 @@ msgstr ""
 "\">Internationalisierung und Lokalisierung</ulink> verfügbar."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1371
+#: best-pkging-practices.dbk:1305
 msgid "Handling debconf translations"
 msgstr "Handhabung von Debconf-Übersetzungen"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1373
+#: best-pkging-practices.dbk:1307
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
@@ -2725,7 +2613,7 @@ msgstr ""
 "sollten ihnen daher besondere Geduld entgegenbringen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1379
+#: best-pkging-practices.dbk:1313
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
@@ -2747,7 +2635,7 @@ msgstr ""
 "bereitgestellt."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1389
+#: best-pkging-practices.dbk:1323
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>.po</filename> files (drawing from <command>gettext</"
@@ -2775,12 +2663,12 @@ msgstr ""
 "refentrytitle> <manvolnum>7</manvolnum> </citerefentry> entnehmen."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1405
+#: best-pkging-practices.dbk:1339
 msgid "Internationalized documentation"
 msgstr "Internationalisierte Dokumentation"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1407
+#: best-pkging-practices.dbk:1341
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
@@ -2791,7 +2679,7 @@ msgstr ""
 "Sie können den Übersetzern einige Dinge erleichtern."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1412
+#: best-pkging-practices.dbk:1346
 msgid ""
 "If you maintain documentation of any size, it is easier for translators if "
 "they have access to a source control system.  That lets translators see the "
@@ -2822,7 +2710,7 @@ msgstr ""
 "Sie dies anpassen und in Ihrem VCS-Bereich bereitstellen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1426
+#: best-pkging-practices.dbk:1360
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
@@ -2836,7 +2724,7 @@ msgstr ""
 "mehrere Dateien hinweg aktuell zu halten."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1432
+#: best-pkging-practices.dbk:1366
 msgid ""
 "Some tools (e.g. <systemitem role=\"package\">po4a</systemitem>, <systemitem "
 "role=\"package\">poxml</systemitem>, or the <systemitem role=\"package"
@@ -2854,18 +2742,18 @@ msgstr ""
 "Dokument aktualisiert wurde."
 
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1444
+#: best-pkging-practices.dbk:1378
 msgid "Common packaging situations"
 msgstr "Übliche Paketierungssituationen"
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1455
+#: best-pkging-practices.dbk:1389
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 "Pakete benutzen <command>autoconf</command>/<command>automake</command>"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1457
+#: best-pkging-practices.dbk:1391
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
@@ -2886,12 +2774,12 @@ msgstr ""
 "diese Datei und die folgenden Empfehlungen zu lesen."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1469
+#: best-pkging-practices.dbk:1403
 msgid "Libraries"
 msgstr "Bibliotheken"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1471
+#: best-pkging-practices.dbk:1405
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
@@ -2906,7 +2794,7 @@ msgstr ""
 "kaputtgehen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1477
+#: best-pkging-practices.dbk:1411
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
@@ -2916,12 +2804,12 @@ msgstr ""
 "ulink> zusammengefasst."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1484
+#: best-pkging-practices.dbk:1418
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1486
+#: best-pkging-practices.dbk:1420
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
@@ -2930,7 +2818,7 @@ msgstr ""
 "\">Richtlinien für Dokumentation</ulink> folgen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1491
+#: best-pkging-practices.dbk:1425
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
@@ -2942,7 +2830,7 @@ msgstr ""
 "sie die Paketquelle abrufen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1496
+#: best-pkging-practices.dbk:1430
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
@@ -2958,7 +2846,7 @@ msgstr ""
 "ist."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1503
+#: best-pkging-practices.dbk:1437
 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
@@ -2970,7 +2858,7 @@ msgstr ""
 "\"package\">doc-base</systemitem>."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1509
+#: best-pkging-practices.dbk:1443
 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "
@@ -2986,7 +2874,7 @@ msgstr ""
 "die Originalautoren gesandt wird."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1516
+#: best-pkging-practices.dbk:1450
 msgid ""
 "The manpages do not need to be written directly in the troff format.  "
 "Popular source formats are Docbook, POD and reST, which can be converted "
@@ -3002,12 +2890,12 @@ msgstr ""
 "schreiben."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1525
+#: best-pkging-practices.dbk:1459
 msgid "Specific types of packages"
 msgstr "Besondere Pakettypen"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1527
+#: best-pkging-practices.dbk:1461
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
@@ -3016,7 +2904,7 @@ msgstr ""
 "zugehörige Paketierungsregeln und -Vorgehensweisen:"
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1533
+#: best-pkging-practices.dbk:1467
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="
@@ -3030,7 +2918,7 @@ msgstr ""
 "systemitem> (architekturunabhängiges Perl-Modul)."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1476
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
@@ -3039,7 +2927,7 @@ msgstr ""
 "policy; im Paket <systemitem role=\"package\">python</systemitem>."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1549
+#: best-pkging-practices.dbk:1483
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
@@ -3048,7 +2936,7 @@ msgstr ""
 "Richtlinie</ulink>."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1556
+#: best-pkging-practices.dbk:1490
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
@@ -3057,7 +2945,7 @@ msgstr ""
 "Richtlinie</ulink>."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1563
+#: best-pkging-practices.dbk:1497
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
@@ -3070,7 +2958,7 @@ msgstr ""
 "\">camlzip</systemitem>."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1571
+#: best-pkging-practices.dbk:1505
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
@@ -3080,7 +2968,7 @@ msgstr ""
 "systemitem> sein."
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1577
+#: best-pkging-practices.dbk:1511
 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"
@@ -3090,12 +2978,12 @@ msgstr ""
 "controller</systemitem> registrieren. Siehe dazu &file-lisp-controller;."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1607
+#: best-pkging-practices.dbk:1541
 msgid "Architecture-independent data"
 msgstr "Architekturunabhängige Daten"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1609
+#: best-pkging-practices.dbk:1543
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
@@ -3110,7 +2998,7 @@ msgstr ""
 "wahrscheinlich am besten, alles in einem einzelnen Paket zu halten."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1616
+#: best-pkging-practices.dbk:1550
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (<filename>_all.deb</"
@@ -3132,12 +3020,12 @@ msgstr ""
 "für das ganze Debian-Archiv ausgeführt wird."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1628
+#: best-pkging-practices.dbk:1562
 msgid "Needing a certain locale during build"
 msgstr "Eine bestimmte Locale wird während des Builds benötigt"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1630
+#: best-pkging-practices.dbk:1564
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
@@ -3146,7 +3034,7 @@ msgstr ""
 "mittels dieses Tricks eine temporäre Datei erstellen:"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1634
+#: best-pkging-practices.dbk:1568
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "
@@ -3159,7 +3047,7 @@ msgstr ""
 "Sie Root sind. Etwas wie Folgendes:"
 
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1639
+#: best-pkging-practices.dbk:1573
 #, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
@@ -3183,12 +3071,12 @@ msgstr ""
 "LOCPATH=$LOCALE_PATH LC_ALL=$LOCALE_NAME.$LOCALE_CHARSET date\n"
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1652
+#: best-pkging-practices.dbk:1586
 msgid "Make transition packages deborphan compliant"
 msgstr "Machen Sie vorübergehende Pakete Deborphan-konform"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1654
+#: best-pkging-practices.dbk:1588
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
@@ -3204,7 +3092,7 @@ msgstr ""
 "andere nutzlose Pakete zu erwischen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1661
+#: best-pkging-practices.dbk:1595
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "
@@ -3217,7 +3105,7 @@ msgstr ""
 "Zeichenketten »dummy« oder »transitional« in dessen Kurzbeschreibung."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1668
+#: best-pkging-practices.dbk:1602
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
@@ -3230,7 +3118,7 @@ msgstr ""
 "oder <command>apt-cache search .|grep transitional</command> aus."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1674
+#: best-pkging-practices.dbk:1608
 msgid ""
 "Also, it is recommended to adjust its section to <literal>oldlibs</literal> "
 "and its priority to <literal>extra</literal> in order to ease "
@@ -3241,7 +3129,7 @@ msgstr ""
 "<command>deborphan</command> zu erleichtern."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1683
+#: best-pkging-practices.dbk:1617
 #, fuzzy
 #| msgid ""
 #| "Best practices for <filename>.orig.tar.{gz,bz2,lzma}</filename> files"
@@ -3251,7 +3139,7 @@ msgstr ""
 "Dateien"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1619
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
@@ -3260,12 +3148,12 @@ msgstr ""
 "paketierte Quellen der Originalautoren."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1689
+#: best-pkging-practices.dbk:1623
 msgid "Pristine source"
 msgstr "Unberührte Quellen"
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1693
+#: best-pkging-practices.dbk:1627
 #, fuzzy
 #| msgid ""
 #| "We cannot prevent upstream authors from changing the tarball they "
@@ -3307,7 +3195,7 @@ msgstr ""
 "dem diese Situation als ein Fehler behandelt wird."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1691
+#: best-pkging-practices.dbk:1625
 #, fuzzy
 #| msgid ""
 #| "The defining characteristic of a pristine source tarball is that the "
@@ -3340,7 +3228,7 @@ msgstr ""
 "Zeit sparen, falls sie Ihre Paketierung im Detail inspizieren möchten."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1711
+#: best-pkging-practices.dbk:1645
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"
@@ -3354,18 +3242,18 @@ msgstr ""
 "Strategie entspricht dem Folgenden:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1719
+#: best-pkging-practices.dbk:1653
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr "Es entpackt den Tarball in eine leeres temporäres Verzeichnis mittels"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: best-pkging-practices.dbk:1722
+#: best-pkging-practices.dbk:1656
 #, no-wrap
 msgid "zcat path/to/<replaceable>packagename</replaceable>_<replaceable>upstream-version</replaceable>.orig.tar.gz | tar xf -\n"
 msgstr "zcat path/to/<replaceable>Paketname</replaceable>_<replaceable>Originalversion</replaceable>.orig.tar.gz | tar xf -\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1727
+#: best-pkging-practices.dbk:1661
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
@@ -3381,7 +3269,7 @@ msgstr ""
 "Bedeutung und geht verloren."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1736
+#: best-pkging-practices.dbk:1670
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "
@@ -3397,12 +3285,12 @@ msgstr ""
 "replaceable>(.orig)</filename> um."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1747
+#: best-pkging-practices.dbk:1681
 msgid "Repackaged upstream source"
 msgstr "Neu paketierte Originalquelle"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1749
+#: best-pkging-practices.dbk:1683
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
@@ -3418,7 +3306,7 @@ msgstr ""
 "den Hochladen entfernen müssen."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1756
+#: best-pkging-practices.dbk:1690
 #, fuzzy
 #| msgid ""
 #| "In these cases the developer must construct a suitable <filename>.orig."
@@ -3450,7 +3338,7 @@ msgstr ""
 "version</replaceable> zusammensetzt."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1765
+#: best-pkging-practices.dbk:1699
 #, fuzzy
 #| msgid ""
 #| "There may be cases where it is desirable to repackage the source even "
@@ -3481,14 +3369,14 @@ msgstr ""
 "paketieren, die unberührt sein könnte."
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1774
+#: best-pkging-practices.dbk:1708
 #, fuzzy
 #| msgid "A repackaged <filename>.orig.tar.{gz,bz2,lzma}</filename>"
 msgid "A repackaged <filename>.orig.tar.{gz,bz2,xz}</filename>"
 msgstr "Ein neu paketiertes <filename>.orig.tar.{gz,bz2,lzma}</filename>"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1713
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be documented in the resulting "
 "source package.  Detailed information on how the repackaged source was "
@@ -3510,7 +3398,7 @@ msgstr ""
 "rules</filename></ulink>."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
-#: best-pkging-practices.dbk:1794
+#: best-pkging-practices.dbk:1728
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
@@ -3529,7 +3417,7 @@ msgstr ""
 "unfreie Komponenten leichter aus dem Quelltext heraustrennbar zu machen."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1792
+#: best-pkging-practices.dbk:1726
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
@@ -3540,7 +3428,7 @@ msgstr ""
 "wurde.<placeholder type=\"footnote\" id=\"0\"/>"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1805
+#: best-pkging-practices.dbk:1739
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
@@ -3561,7 +3449,7 @@ msgstr ""
 "eines Konfigurationsskripts ist."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1814
+#: best-pkging-practices.dbk:1748
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
@@ -3573,7 +3461,7 @@ msgstr ""
 "Originaldistribution zu suchen)."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1821
+#: best-pkging-practices.dbk:1755
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<filename><replaceable>packagename</replaceable>-<replaceable>upstream-"
@@ -3588,7 +3476,7 @@ msgstr ""
 "paketierten Tarballs."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1829
+#: best-pkging-practices.dbk:1763
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
@@ -3597,12 +3485,12 @@ msgstr ""
 "maximalen Komprimierung gepackt werden."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1770
 msgid "Changing binary files"
 msgstr "Ändern binärer Dateien"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1838
+#: best-pkging-practices.dbk:1772
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "
@@ -3627,12 +3515,12 @@ msgstr ""
 "entschlüsseln (und an ihren offiziellen Platz verschieben)."
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1853
+#: best-pkging-practices.dbk:1787
 msgid "Best practices for debug packages"
 msgstr "Optimale Vorgehensweisen für Debug-Pakete"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1855
+#: best-pkging-practices.dbk:1789
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that <command>gdb</command> can use.  Since Debian "
@@ -3652,7 +3540,7 @@ msgstr ""
 "diesen Informationen aufzublähen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1863
+#: best-pkging-practices.dbk:1797
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
@@ -3674,7 +3562,7 @@ msgstr ""
 "oder der X-Server sind ebenfalls geeignete Kandidaten für Debug-Pakete."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1873
+#: best-pkging-practices.dbk:1807
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
@@ -3702,7 +3590,7 @@ msgstr ""
 "<filename>/usr/lib/debug/usr/lib/libfoo.so.1</filename>."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1819
 msgid ""
 "The debugging symbols can be extracted from an object file using "
 "<command>objcopy --only-keep-debug</command>.  Then the object file can be "
@@ -3719,7 +3607,7 @@ msgstr ""
 "citerefentry> erklärt im Detail, wie dies funktioniert."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1893
+#: best-pkging-practices.dbk:1827
 msgid ""
 "The <command>dh_strip</command> command in <systemitem role=\"package"
 "\">debhelper</systemitem> supports creating debug packages, and can take "
@@ -3738,7 +3626,7 @@ msgstr ""
 "<filename>debian/control</filename> für das Debug-Paket hinzufügen."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1900
+#: best-pkging-practices.dbk:1834
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
@@ -3748,18 +3636,18 @@ msgstr ""
 "Version versehen werden. Zum Beispiel:"
 
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1904
+#: best-pkging-practices.dbk:1838
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr "Depends: libfoo (= ${binary:Version})\n"
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1908
+#: best-pkging-practices.dbk:1842
 msgid "Best practices for meta-packages"
 msgstr "Optimale Vorgehensweisen für Meta-Pakete"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1910
+#: best-pkging-practices.dbk:1844
 msgid ""
 "A meta-package is a mostly empty package that makes it easy to install a "
 "coherent set of packages that can evolve over time. It achieves this by "
@@ -3788,7 +3676,7 @@ msgstr ""
 "latest</systemitem>)."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1924
+#: best-pkging-practices.dbk:1858
 msgid ""
 "The long description of the meta-package must clearly document its purpose "
 "so that the user knows what he will lose if he removes the package. Being "
@@ -3806,3 +3694,159 @@ msgstr ""
 "installiert wurden. Diese neigen dazu, wichtig für reibungslose Upgrades des "
 "Systems zu sein und der Benutzer sollte entmutigt werden, sie zu entfernen, "
 "um mögliche Schäden zu vermeiden."
+
+#~ msgid ""
+#~ "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. "
+#~ "The first method does <emphasis>preventive</emphasis> search and replace "
+#~ "actions in the PO files. The latter uses <command>gettext</command> "
+#~ "utilities to <emphasis>unfuzzy</emphasis> strings."
+#~ msgstr ""
+#~ "Um aus Übersetzungen <emphasis>Fuzzy-Markierungen zu entfernen</"
+#~ "emphasis>, können Sie nach zwei Methoden verfahren. Bei der ersten "
+#~ "Methode werden <emphasis>präventiv</emphasis> Such- und "
+#~ "Ersetzungsaktionen in den PO-Dateien durchgeführt. Letztere benutzt "
+#~ "<command>gettext</command>-Hilfswerkzeuge, um aus Zeichenketten "
+#~ "<emphasis>Fuzzy-Markierungen zu entfernen</emphasis>."
+
+#~ msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
+#~ msgstr ""
+#~ "Methode <emphasis>Fuzzy-Markierungen präventiv zu entfernen</emphasis>:"
+
+#~ msgid ""
+#~ "Try finding a complete translation file <emphasis role=\"strong\">before</"
+#~ "emphasis> the change:"
+#~ msgstr ""
+#~ "Versuchen Sie eine vollständige Übersetzungsdatei <emphasis role=\"strong"
+#~ "\">vor</emphasis> der Änderung zu finden:"
+
+#~ msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+#~ msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+
+#~ msgid ""
+#~ "The file only showing <emphasis>translated</emphasis> items will be used "
+#~ "as the reference file. If there is none (which should not happen if you "
+#~ "take care to properly interact with translators), you should use the file "
+#~ "with the most translated strings."
+#~ msgstr ""
+#~ "Die Datei, die nur <emphasis>übersetzte</emphasis> Elemente anzeigt, wird "
+#~ "als Bezugsdatei benutzt. Falls es keine gibt (was nicht vorkommen sollte, "
+#~ "falls Sie auf ein fachgerechtes Zusammenspiel mit Übersetzern achten), "
+#~ "sollten Sie die Datei mit den meisten übersetzten Zeichenketten benutzen."
+
+#~ msgid ""
+#~ "Identify the needed change. In this example, let's assume the change is "
+#~ "about fixing a typo in the word <literal>typo</literal> which was "
+#~ "inadvertently written as <literal>tpyo</literal>. Therefore, the change "
+#~ "is <command>s/tpyo/typo</command>."
+#~ msgstr ""
+#~ "Finden Sie heraus, welche Änderung nötig ist. In diesem Beispiel wird "
+#~ "davon ausgegangen, dass die Änderung darin besteht, einen Tippfehler im "
+#~ "Wort <literal>typo</literal> zu korrigieren, das versehentlich "
+#~ "<literal>tpyo</literal> geschrieben wurde. Daher ist die Änderung "
+#~ "<command>s/tpyo/typo</command>."
+
+#~ msgid ""
+#~ "Check that this change is only applied to the place where you really "
+#~ "intend to make it and <emphasis role=\"strong\">not</emphasis> in any "
+#~ "other place where the original string is appropriate. This specifically "
+#~ "applies to change in punctuation, for instance."
+#~ msgstr ""
+#~ "Prüfen Sie, ob die Änderung nur an der Stelle angewandt wird, an der Sie "
+#~ "sie wirklich vornehmen möchten und <emphasis role=\"strong\">nicht</"
+#~ "emphasis> an irgendeiner anderen Stelle, an der die Originalzeichenkette "
+#~ "so gewollt ist. Dies wird beispielsweise eigens bei der Änderung der "
+#~ "Zeichensetzung angewandt."
+
+#~ msgid ""
+#~ "Modify all PO files by using <command>sed</command>. The use of that "
+#~ "command is recommended over any text editor to guarantee that the files "
+#~ "encoding will not be broken by the edit action:"
+#~ msgstr ""
+#~ "Ändern Sie alle PO-Dateien mittels <command>sed</command>. Es wird "
+#~ "empfohlen, diesen Befehl über einen Text-Editor zu benutzen, um zu "
+#~ "gewährleisten, dass die Zeichencodierung der Datei nicht durch die "
+#~ "Bearbeitungsaktion zerstört wird:"
+
+#~ msgid ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+#~ msgstr ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+
+#~ msgid "Run <command>debconf-updatepo</command>."
+#~ msgstr "Führen Sie <command>debconf-updatepo</command> aus."
+
+#~ msgid ""
+#~ "Check the <filename>foo.po</filename> reference file. Its statistics "
+#~ "should not be changed:"
+#~ msgstr ""
+#~ "Prüfen Sie die Bezugsdatei <filename>foo.po</filename>. Die Statistik "
+#~ "dieser Datei sollte unverändert sein:"
+
+#~ msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+#~ msgstr "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+
+#~ msgid ""
+#~ "If the file's statistics changed, you did something wrong. Try again or "
+#~ "ask for help on the &email-debian-i18n; mailing list."
+#~ msgstr ""
+#~ "Falls sich die Statistik dieser Datei geändert hat, haben Sie etwas "
+#~ "falsch gemacht. Versuchen Sie es erneut oder bitten Sie auf der "
+#~ "Mailingliste &email-debian-i18n; um Hilfe."
+
+#~ msgid "Gettext utilities method:"
+#~ msgstr "Methode mit Gettext-Hilfswerkzeugen:"
+
+#~ msgid ""
+#~ "Put all incomplete PO files out of the way.  You can check the "
+#~ "completeness by using (needs the <systemitem role=\"package\">gettext</"
+#~ "systemitem> package installed):"
+#~ msgstr ""
+#~ "Räumen Sie alle unvollständigen PO-Dateien aus dem Weg. Sie können die "
+#~ "Vollständigkeit prüfen (das Paket <systemitem role=\"package\">gettext</"
+#~ "systemitem> muss installiert sein):"
+
+#~ msgid ""
+#~ "Move all files which report either fuzzy strings to a temporary place.  "
+#~ "Files which report no fuzzy strings (only translated and untranslated) "
+#~ "will be kept in place."
+#~ msgstr ""
+#~ "Verschieben Sie alle Dateien, die auch unvollständige Zeichenketten "
+#~ "enthalten temporär an eine andere Stelle. Dateien ohne unvollständige "
+#~ "Zeichenketten (nur übersetzt und unübersetzte) bleiben wo sie sind."
+
+#~ msgid ""
+#~ "Now <emphasis role=\"strong\">and now only</emphasis>, modify the "
+#~ "template for the typos and check again that translation are not impacted "
+#~ "(typos, spelling errors, sometimes typographical corrections are usually "
+#~ "OK)."
+#~ msgstr ""
+#~ "Ändern sie nun <emphasis role=\"strong\">und nur nun</emphasis> die "
+#~ "Tippfehler in der Schablone und prüfen Sie erneut, ob keine Übersetzungen "
+#~ "betroffen sind (normalerweise sind Tippfehler, Rechtschreibfehler und "
+#~ "manchmal typografische Korrekturen OK)."
+
+#~ msgid ""
+#~ "Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
+#~ "modified in translations.  You can see this by running the above again."
+#~ msgstr ""
+#~ "Führen Sie <command>debconf-updatepo</command> aus. Dies wird alle von "
+#~ "Ihnen in Übersetzungen geänderten Zeichenketten mit »fuzzy« markieren. "
+#~ "Sie können dies sehen, wenn Sie obigen Aufruf erneut ausführen."
+
+#~ msgid "Use the following command:"
+#~ msgstr "Benutzen Sie den folgenden Befehl:"
+
+#~ msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+#~ msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+
+#~ msgid ""
+#~ "Move back to <filename>debian/po</filename> the files which showed fuzzy "
+#~ "strings in the first step."
+#~ msgstr ""
+#~ "Verschieben Sie die Dateien mit unvollständige Zeichenketten aus dem "
+#~ "ersten Schritt zurück nach <filename>debian/po</filename>."
+
+#~ msgid "Run <command>debconf-updatepo</command> again."
+#~ msgstr "Führen Sie erneut <command>debconf-updatepo</command> aus."
diff --git a/po4a/fr/best-pkging-practices.po b/po4a/fr/best-pkging-practices.po
index e1e0d55..fe42d34 100644
--- a/po4a/fr/best-pkging-practices.po
+++ b/po4a/fr/best-pkging-practices.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-22 09:49-0400\n"
+"POT-Creation-Date: 2012-01-10 17:49-0400\n"
 "PO-Revision-Date: 2011-10-22 09:11-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1905,245 +1905,115 @@ msgstr ""
 "\">debconf</systemitem> ne sera plus traduit tant qu'un traducteur n'aura "
 "pas envoyé de mise à jour."
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:833
 msgid ""
-"To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
-"first method does <emphasis>preventive</emphasis> search and replace actions "
-"in the PO files. The latter uses <command>gettext</command> utilities to "
-"<emphasis>unfuzzy</emphasis> strings."
+"To <emphasis>unfuzzy</emphasis> translations, you can use "
+"<command>msguntypot</command> (part of the <systemitem role=\"package"
+"\">po4a</systemitem> package)."
 msgstr ""
-"Pour rendre les traductions à nouveau complètes (« <emphasis>unfuzzy</"
-"emphasis> »), deux méthodes existent. La première, <emphasis>préventive</"
-"emphasis>, effectue recherche et remplacement dans le fichier PO. La seconde "
-"utilise <command>gettext</command> pour rendre des chaînes à nouveau "
-"complètes (« <emphasis>unfuzzy</emphasis> »)."
 
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:839
-msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
-msgstr "Méthode <emphasis>préventive</emphasis> :"
-
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:844
-msgid ""
-"Try finding a complete translation file <emphasis role=\"strong\">before</"
-"emphasis> the change:"
+#: best-pkging-practices.dbk:840
+msgid "Regenerate the POT and PO files."
 msgstr ""
-"essayer de trouver un fichier de traduction complet <emphasis role=\"strong"
-"\">avant</emphasis> la modification :"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:918
+#: best-pkging-practices.dbk:842 best-pkging-practices.dbk:865
 #, no-wrap
-msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:849
-msgid ""
-"The file only showing <emphasis>translated</emphasis> items will be used as "
-"the reference file. If there is none (which should not happen if you take "
-"care to properly interact with translators), you should use the file with "
-"the most translated strings."
+msgid "debconf-updatepo"
 msgstr ""
-"Le fichier ne montrant que des messages <emphasis>traduits</emphasis> sera "
-"utilisé comme fichier de référence. S'il n'y en a aucun (ce qui ne devrait "
-"pas arriver si vous collaborez correctement avec les traducteurs), vous "
-"devriez utiliser le fichier qui contient le plus de messages traduits ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:857
-msgid ""
-"Identify the needed change. In this example, let's assume the change is "
-"about fixing a typo in the word <literal>typo</literal> which was "
-"inadvertently written as <literal>tpyo</literal>. Therefore, the change is "
-"<command>s/tpyo/typo</command>."
+#: best-pkging-practices.dbk:846
+msgid "Make a copy of the POT file."
 msgstr ""
-"identifier la modification nécessaire. Dans l'exemple suivant, supposons que "
-"la modification est une correction de faute de frappe dans le mot "
-"« <literal>typo</literal> » qui a été écrit « <literal>tpyo</literal> » par "
-"mégarde. Par conséquent, la modification est <command>s/tpyo/typo</command> ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:865
-msgid ""
-"Check that this change is only applied to the place where you really intend "
-"to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
-"where the original string is appropriate. This specifically applies to "
-"change in punctuation, for instance."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:848
+#, no-wrap
+msgid "cp templates.pot templates.pot.orig"
 msgstr ""
-"vérifier que la modification ne s'applique bien que là où il faut et "
-"<emphasis role=\"strong\">pas</emphasis> ailleurs, où la chaîne d'origine "
-"est appropriée. Cette remarque s'applique en particulier aux modifications "
-"de ponctuation ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:873
-msgid ""
-"Modify all PO files by using <command>sed</command>. The use of that command "
-"is recommended over any text editor to guarantee that the files encoding "
-"will not be broken by the edit action:"
+#: best-pkging-practices.dbk:852
+msgid "Make a copy of all the PO files."
 msgstr ""
-"modifier tous les fichiers PO avec <command>sed</command>. L'utilisation de "
-"cette commande est recommandée par rapport à n'importe quel éditeur de texte "
-"pour garantir que l'encodage des fichiers soit respecté lors de la "
-"modification :"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:878
+#: best-pkging-practices.dbk:854
 #, no-wrap
-msgid ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+msgid "mkdir po_fridge; cp *.po po_fridge"
 msgstr ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:884
-msgid "Change the debconf template file to fix the typo."
+#: best-pkging-practices.dbk:858
+#, fuzzy
+#| msgid "Change the debconf template file to fix the typo."
+msgid "Change the debconf template files to fix the typos."
 msgstr ""
 "modifier le fichier d'écrans <systemitem role=\"package\">debconf</"
 "systemitem> (<filename>templates</filename>) pour corriger la faute de "
 "frappe ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:889
-msgid "Run <command>debconf-updatepo</command>."
-msgstr "exécuter la commande <command>debconf-updatepo</command> ;"
-
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:894
-msgid ""
-"Check the <filename>foo.po</filename> reference file. Its statistics should "
-"not be changed:"
+#: best-pkging-practices.dbk:863
+msgid "Regenerate the POT and PO files (again)."
 msgstr ""
-"vérifier le fichier <filename>truc.po</filename> de référence, ses "
-"statistiques devraient être identiques :"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:898
-#, no-wrap
-msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
-msgstr "msgfmt -o /dev/null --statistics debian/po/truc.po\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:903
+#: best-pkging-practices.dbk:867
 msgid ""
-"If the file's statistics changed, you did something wrong. Try again or ask "
-"for help on the &email-debian-i18n; mailing list."
+"At this point, the typo fix fuzzied all the translations, and this "
+"unfortunate change is the only one between the PO files of your main "
+"directory and the one from the fridge. Here is how to solve this."
 msgstr ""
-"si les statistiques du fichier ont changé, vous avez commis une erreur. "
-"Essayez de nouveau ou demandez de l'aide sur la liste de diffusion &email-"
-"debian-i18n;."
 
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:909
-msgid "Gettext utilities method:"
-msgstr "Méthode <systemitem role=\"package\">gettext</systemitem> :"
-
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:914
-msgid ""
-"Put all incomplete PO files out of the way.  You can check the completeness "
-"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
-"package installed):"
+#: best-pkging-practices.dbk:874
+msgid "Discard fuzzy translation, restore the ones from the fridge."
 msgstr ""
-"déplacer les fichiers PO incomplets à un endroit temporaire. Les fichiers "
-"peuvent être contrôlés avec la commande suivante (qui nécessite "
-"l'installation du paquet <systemitem role=\"package\">gettext</systemitem>) :"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:922
-msgid ""
-"Move all files which report either fuzzy strings to a temporary place.  "
-"Files which report no fuzzy strings (only translated and untranslated) will "
-"be kept in place."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:876
+#, no-wrap
+msgid "cp po_fridge/*.po ."
 msgstr ""
-"déplacer tous les fichiers qui comportent des chaînes approximatives "
-"(« <literal>fuzzy</literal> ») dans un répertoire temporaire. Les fichiers "
-"qui ne comportent aucune chaîne approximative (seulement des chaînes "
-"traduites ou non traduites) peuvent être laissés en place ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:929
+#: best-pkging-practices.dbk:880
 msgid ""
-"Now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
-"for the typos and check again that translation are not impacted (typos, "
-"spelling errors, sometimes typographical corrections are usually OK)."
+"Manually merge the PO files with the new POT file, but taking the useless "
+"fuzzy into account."
 msgstr ""
-"maintenant <emphasis role=\"strong\">et pas avant</emphasis>, vous pouvez "
-"corriger le fichier d'écrans <systemitem role=\"package\">debconf</"
-"systemitem> (<filename>templates</filename>) en vous assurant à nouveau que "
-"les traductions ne risquent pas d'être affectées (des fautes de frappes, des "
-"erreurs grammaticales et certaines erreurs typographiques ne posent en "
-"général pas de problèmes) ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:936
-msgid ""
-"Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
-"modified in translations.  You can see this by running the above again."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:882
+#, no-wrap
+msgid "msguntypot -o templates.pot.orig -n templates.pot *.po"
 msgstr ""
-"exécuter la commande <command>debconf-updatepo</command>. Cette commande va "
-"rendre approximatives les traductions de toutes les chaînes modifiées. Cela "
-"peut être contrôlé avec la commande ci-dessus à nouveau ;"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:942
-msgid "Use the following command:"
-msgstr "utiliser la commande suivante :"
+#: best-pkging-practices.dbk:886
+msgid "Clean up."
+msgstr ""
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:944
+#: best-pkging-practices.dbk:888
 #, no-wrap
-msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:948
-msgid ""
-"Move back to <filename>debian/po</filename> the files which showed fuzzy "
-"strings in the first step."
+msgid "rm -rf templates.pot.orig po_fridge"
 msgstr ""
-"replacer à nouveau dans <filename>debian/po</filename> les fichiers "
-"contenant des chaînes approximatives à la première étape ;"
-
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:953
-msgid "Run <command>debconf-updatepo</command> again."
-msgstr "exécuter la commande <command>debconf-updatepo</command> à nouveau."
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:960
+#: best-pkging-practices.dbk:894
 msgid "Do not make assumptions about interfaces"
 msgstr "Proscrire toute supposition sur les interfaces utilisateurs"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:962
+#: best-pkging-practices.dbk:896
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer Yes...</"
@@ -2158,7 +2028,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:901
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
@@ -2174,7 +2044,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:907
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
@@ -2184,13 +2054,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:979
+#: best-pkging-practices.dbk:913
 msgid "Do not use first person"
 msgstr "Proscrire l'utilisation de la première personne"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:981
+#: best-pkging-practices.dbk:915
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 "emphasis> or <emphasis>We recommend...</emphasis>).  The computer is not a "
@@ -2213,13 +2083,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:991
+#: best-pkging-practices.dbk:925
 msgid "Be gender neutral"
 msgstr "Neutralité en genre"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:993
+#: best-pkging-practices.dbk:927
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
@@ -2229,13 +2099,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1001
+#: best-pkging-practices.dbk:935
 msgid "Templates fields definition"
 msgstr "Définition des champs de modèles (« <literal>templates</literal> »)."
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1003
+#: best-pkging-practices.dbk:937
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
@@ -2247,19 +2117,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1008
+#: best-pkging-practices.dbk:942
 msgid "Type"
 msgstr "<literal>Type</literal>"
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1010
+#: best-pkging-practices.dbk:944
 msgid "string"
 msgstr "<literal>string</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1012
+#: best-pkging-practices.dbk:946
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
@@ -2268,13 +2138,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1017
+#: best-pkging-practices.dbk:951
 msgid "password"
 msgstr "<literal>password</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1019
+#: best-pkging-practices.dbk:953
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
@@ -2287,13 +2157,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1026
+#: best-pkging-practices.dbk:960
 msgid "boolean"
 msgstr "<literal>boolean</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:962
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
@@ -2304,13 +2174,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1034
+#: best-pkging-practices.dbk:968
 msgid "select"
 msgstr "<literal>select</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1036
+#: best-pkging-practices.dbk:970
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
@@ -2323,7 +2193,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1041
+#: best-pkging-practices.dbk:975
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
@@ -2336,7 +2206,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1046
+#: best-pkging-practices.dbk:980
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
@@ -2347,7 +2217,7 @@ msgstr ""
 "choix traduisibles. Par exemple :"
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
-#: best-pkging-practices.dbk:1051
+#: best-pkging-practices.dbk:985
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
@@ -2366,7 +2236,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1059
+#: best-pkging-practices.dbk:993
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
@@ -2379,7 +2249,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1064
+#: best-pkging-practices.dbk:998
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>7</"
@@ -2392,13 +2262,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1072
+#: best-pkging-practices.dbk:1006
 msgid "multiselect"
 msgstr "<literal>multiselect</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1008
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
@@ -2408,13 +2278,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1080
+#: best-pkging-practices.dbk:1014
 msgid "note"
 msgstr "<literal>note</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1082
+#: best-pkging-practices.dbk:1016
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
@@ -2431,25 +2301,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1091
+#: best-pkging-practices.dbk:1025
 msgid "text"
 msgstr "<literal>text</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1093
+#: best-pkging-practices.dbk:1027
 msgid "This type is now considered obsolete: don't use it."
 msgstr "ce type est maintenant obsolète : il ne faut pas l'utiliser."
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1098
+#: best-pkging-practices.dbk:1032
 msgid "error"
 msgstr "<literal>error</literal>"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1100
+#: best-pkging-practices.dbk:1034
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
@@ -2462,7 +2332,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1105
+#: best-pkging-practices.dbk:1039
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
@@ -2473,13 +2343,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1047
 msgid "Description: short and extended description"
 msgstr "<literal>Description</literal> : description courte et étendue"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1115
+#: best-pkging-practices.dbk:1049
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
@@ -2490,7 +2360,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1053
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accommodated by most debconf interfaces.  Keeping it short also helps "
@@ -2505,7 +2375,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1059
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
@@ -2520,7 +2390,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1131
+#: best-pkging-practices.dbk:1065
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
@@ -2530,7 +2400,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1135
+#: best-pkging-practices.dbk:1069
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
@@ -2546,7 +2416,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1142
+#: best-pkging-practices.dbk:1076
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
@@ -2558,7 +2428,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1081
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
@@ -2573,7 +2443,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1153
+#: best-pkging-practices.dbk:1087
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
@@ -2583,7 +2453,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1091
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
@@ -2594,13 +2464,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1163
+#: best-pkging-practices.dbk:1097
 msgid "Choices"
 msgstr "<literal>Choices</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1165
+#: best-pkging-practices.dbk:1099
 msgid ""
 "This field should be used for select and multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
@@ -2612,13 +2482,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1172
+#: best-pkging-practices.dbk:1106
 msgid "Default"
 msgstr "<literal>Default</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1174
+#: best-pkging-practices.dbk:1108
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
@@ -2631,19 +2501,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1183
+#: best-pkging-practices.dbk:1117
 msgid "Templates fields specific style guide"
 msgstr "Guide de style spécifique à certains modèles"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1185
+#: best-pkging-practices.dbk:1119
 msgid "Type field"
 msgstr "Champ <literal>Type</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1121
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
@@ -2653,13 +2523,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1127
 msgid "Description field"
 msgstr "Champ <literal>Description</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1195
+#: best-pkging-practices.dbk:1129
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
@@ -2670,13 +2540,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1199
+#: best-pkging-practices.dbk:1133
 msgid "String/password templates"
 msgstr "Modèles <literal>string</literal> et <literal>password</literal>"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1203
+#: best-pkging-practices.dbk:1137
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "
@@ -2689,7 +2559,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1210
+#: best-pkging-practices.dbk:1144
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
@@ -2702,13 +2572,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1220
+#: best-pkging-practices.dbk:1154
 msgid "Boolean templates"
 msgstr "Modèles <literal>boolean</literal>"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1224
+#: best-pkging-practices.dbk:1158
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
@@ -2722,7 +2592,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1232
+#: best-pkging-practices.dbk:1166
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
@@ -2733,13 +2603,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1240
+#: best-pkging-practices.dbk:1174
 msgid "Select/Multiselect"
 msgstr "Modèles <literal>select</literal> et <literal>multiselect</literal>"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1244
+#: best-pkging-practices.dbk:1178
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "
@@ -2754,7 +2624,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1252
+#: best-pkging-practices.dbk:1186
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
@@ -2769,13 +2639,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1262
+#: best-pkging-practices.dbk:1196
 msgid "Notes"
 msgstr "Modèles <literal>note</literal>"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1266
+#: best-pkging-practices.dbk:1200
 msgid ""
 "The short description should be considered to be a <emphasis role=\"strong"
 "\">title</emphasis>."
@@ -2785,7 +2655,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1205
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
@@ -2795,7 +2665,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1277
+#: best-pkging-practices.dbk:1211
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
@@ -2819,13 +2689,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1292
+#: best-pkging-practices.dbk:1226
 msgid "Choices field"
 msgstr "Champ <literal>Choices</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1294
+#: best-pkging-practices.dbk:1228
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
@@ -2838,13 +2708,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1235 best-pkging-practices.dbk:1273
 msgid "Default field"
 msgstr "Champ <literal>Default</literal>"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1303
+#: best-pkging-practices.dbk:1237
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
@@ -2857,7 +2727,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1242
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
@@ -2871,13 +2741,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1314
+#: best-pkging-practices.dbk:1248
 msgid "Example, taken from the geneweb package templates:"
 msgstr "Exemple, pris dans le paquet geneweb :"
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:1317
+#: best-pkging-practices.dbk:1251
 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
@@ -2902,7 +2772,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1328
+#: best-pkging-practices.dbk:1262
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
@@ -2915,7 +2785,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1267
 msgid ""
 "The comments are needed as the _Default trick is a bit confusing: the "
 "translators may put their own choice"
@@ -2926,7 +2796,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1341
+#: best-pkging-practices.dbk:1275
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
@@ -2937,7 +2807,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1345
+#: best-pkging-practices.dbk:1279
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see <xref linkend=\"s6.5.2.2\"/>), consider making this field translatable, "
@@ -2950,7 +2820,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1350
+#: best-pkging-practices.dbk:1284
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
@@ -2965,12 +2835,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1362
+#: best-pkging-practices.dbk:1296
 msgid "Internationalization"
 msgstr "Internationalisation"
 
 #. type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:1364
+#: best-pkging-practices.dbk:1298
 msgid ""
 "This section contains global information for developers to make translators' "
 "life easier.  More information for translators and developers interested in "
@@ -2985,14 +2855,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1371
+#: best-pkging-practices.dbk:1305
 msgid "Handling debconf translations"
 msgstr ""
 "Gestion des traductions <systemitem role=\"package\">debconf</systemitem>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1373
+#: best-pkging-practices.dbk:1307
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
@@ -3007,7 +2877,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1379
+#: best-pkging-practices.dbk:1313
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
@@ -3030,7 +2900,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1389
+#: best-pkging-practices.dbk:1323
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>.po</filename> files (drawing from <command>gettext</"
@@ -3060,13 +2930,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1405
+#: best-pkging-practices.dbk:1339
 msgid "Internationalized documentation"
 msgstr "Documentation internationalisée"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1407
+#: best-pkging-practices.dbk:1341
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
@@ -3079,7 +2949,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1412
+#: best-pkging-practices.dbk:1346
 msgid ""
 "If you maintain documentation of any size, it is easier for translators if "
 "they have access to a source control system.  That lets translators see the "
@@ -3110,7 +2980,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1426
+#: best-pkging-practices.dbk:1360
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
@@ -3124,7 +2994,7 @@ msgstr ""
 "nombreux fichiers."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1432
+#: best-pkging-practices.dbk:1366
 msgid ""
 "Some tools (e.g. <systemitem role=\"package\">po4a</systemitem>, <systemitem "
 "role=\"package\">poxml</systemitem>, or the <systemitem role=\"package"
@@ -3143,20 +3013,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1444
+#: best-pkging-practices.dbk:1378
 msgid "Common packaging situations"
 msgstr "Situations courantes de gestion de paquets"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1455
+#: best-pkging-practices.dbk:1389
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 "Paquets utilisant <command>autoconf</command> ou <command>automake</command>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1457
+#: best-pkging-practices.dbk:1391
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
@@ -3178,13 +3048,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1469
+#: best-pkging-practices.dbk:1403
 msgid "Libraries"
 msgstr "Bibliothèques"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1471
+#: best-pkging-practices.dbk:1405
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
@@ -3200,7 +3070,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1477
+#: best-pkging-practices.dbk:1411
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
@@ -3211,13 +3081,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1484
+#: best-pkging-practices.dbk:1418
 msgid "Documentation"
 msgstr "Documentation"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1486
+#: best-pkging-practices.dbk:1420
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
@@ -3227,7 +3097,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1491
+#: best-pkging-practices.dbk:1425
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
@@ -3240,7 +3110,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1496
+#: best-pkging-practices.dbk:1430
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
@@ -3256,7 +3126,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1503
+#: best-pkging-practices.dbk:1437
 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
@@ -3268,7 +3138,7 @@ msgstr ""
 "\"package\">doc-base</systemitem> pour plus d'informations."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1509
+#: best-pkging-practices.dbk:1443
 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "
@@ -3284,7 +3154,7 @@ msgstr ""
 "amont."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1516
+#: best-pkging-practices.dbk:1450
 msgid ""
 "The manpages do not need to be written directly in the troff format.  "
 "Popular source formats are Docbook, POD and reST, which can be converted "
@@ -3301,13 +3171,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1525
+#: best-pkging-practices.dbk:1459
 msgid "Specific types of packages"
 msgstr "Catégories particulières de paquets"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1527
+#: best-pkging-practices.dbk:1461
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
@@ -3317,7 +3187,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1533
+#: best-pkging-practices.dbk:1467
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="
@@ -3332,7 +3202,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1476
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
@@ -3343,7 +3213,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1549
+#: best-pkging-practices.dbk:1483
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
@@ -3353,7 +3223,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1556
+#: best-pkging-practices.dbk:1490
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
@@ -3363,7 +3233,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1563
+#: best-pkging-practices.dbk:1497
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
@@ -3377,7 +3247,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1571
+#: best-pkging-practices.dbk:1505
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
@@ -3388,7 +3258,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1577
+#: best-pkging-practices.dbk:1511
 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"
@@ -3400,13 +3270,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1607
+#: best-pkging-practices.dbk:1541
 msgid "Architecture-independent data"
 msgstr "Données indépendantes de l'architecture"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1609
+#: best-pkging-practices.dbk:1543
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
@@ -3423,7 +3293,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1616
+#: best-pkging-practices.dbk:1550
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (<filename>_all.deb</"
@@ -3446,13 +3316,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1628
+#: best-pkging-practices.dbk:1562
 msgid "Needing a certain locale during build"
 msgstr "Besoin de paramètres régionaux spécifiques lors de la construction"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1630
+#: best-pkging-practices.dbk:1564
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
@@ -3463,7 +3333,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1634
+#: best-pkging-practices.dbk:1568
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "
@@ -3478,7 +3348,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1639
+#: best-pkging-practices.dbk:1573
 #, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
@@ -3503,7 +3373,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1652
+#: best-pkging-practices.dbk:1586
 msgid "Make transition packages deborphan compliant"
 msgstr ""
 "Paquets de transition conformes à <systemitem role=\"package\">deborphan</"
@@ -3511,7 +3381,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1654
+#: best-pkging-practices.dbk:1588
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
@@ -3529,7 +3399,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1661
+#: best-pkging-practices.dbk:1595
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "
@@ -3545,7 +3415,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1668
+#: best-pkging-practices.dbk:1602
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
@@ -3558,7 +3428,7 @@ msgstr ""
 "command> ou <command>apt-cache search .|grep transitional</command>."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1674
+#: best-pkging-practices.dbk:1608
 msgid ""
 "Also, it is recommended to adjust its section to <literal>oldlibs</literal> "
 "and its priority to <literal>extra</literal> in order to ease "
@@ -3570,7 +3440,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1683
+#: best-pkging-practices.dbk:1617
 msgid "Best practices for <filename>.orig.tar.{gz,bz2,xz}</filename> files"
 msgstr ""
 "Meilleures pratiques pour les fichiers <filename>.orig.tar.{gz,bz2,xz}</"
@@ -3578,7 +3448,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1619
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
@@ -3589,13 +3459,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1689
+#: best-pkging-practices.dbk:1623
 msgid "Pristine source"
 msgstr "Source originelle (« <literal>pristine</literal> »)"
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1693
+#: best-pkging-practices.dbk:1627
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
@@ -3624,7 +3494,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1691
+#: best-pkging-practices.dbk:1625
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "
 "<filename>.orig.tar.{gz,bz2,xz}</filename> file is byte-for-byte identical "
@@ -3647,7 +3517,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1711
+#: best-pkging-practices.dbk:1645
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"
@@ -3662,20 +3532,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1719
+#: best-pkging-practices.dbk:1653
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr "elle extrait l'archive dans un répertoire temporaire :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: best-pkging-practices.dbk:1722
+#: best-pkging-practices.dbk:1656
 #, no-wrap
 msgid "zcat path/to/<replaceable>packagename</replaceable>_<replaceable>upstream-version</replaceable>.orig.tar.gz | tar xf -\n"
 msgstr "zcat path/to/<replaceable>nomdupaquet</replaceable>_<replaceable>version-amont</replaceable>.orig.tar.gz | tar xf -\n"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1727
+#: best-pkging-practices.dbk:1661
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
@@ -3691,7 +3561,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1736
+#: best-pkging-practices.dbk:1670
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "
@@ -3707,13 +3577,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1747
+#: best-pkging-practices.dbk:1681
 msgid "Repackaged upstream source"
 msgstr "Source amont reconstruite"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1749
+#: best-pkging-practices.dbk:1683
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
@@ -3731,7 +3601,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1756
+#: best-pkging-practices.dbk:1690
 msgid ""
 "In these cases the developer must construct a suitable <filename>.orig.tar."
 "{gz,bz2,xz}</filename> file himself.  We refer to such a tarball as a "
@@ -3753,7 +3623,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1765
+#: best-pkging-practices.dbk:1699
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <filename>.tar.{gz,bz2,xz}</filename> that could in "
@@ -3774,13 +3644,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1774
+#: best-pkging-practices.dbk:1708
 msgid "A repackaged <filename>.orig.tar.{gz,bz2,xz}</filename>"
 msgstr "Un fichier <filename>.orig.tar.{gz,bz2,xz}</filename> reconstruit :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1713
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be documented in the resulting "
 "source package.  Detailed information on how the repackaged source was "
@@ -3802,7 +3672,7 @@ msgstr ""
 "principal : <filename>debian/rules</filename></ulink> ;"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
-#: best-pkging-practices.dbk:1794
+#: best-pkging-practices.dbk:1728
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
@@ -3821,7 +3691,7 @@ msgstr ""
 "du reste des sources."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1792
+#: best-pkging-practices.dbk:1726
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
@@ -3833,7 +3703,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1805
+#: best-pkging-practices.dbk:1739
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
@@ -3854,7 +3724,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1814
+#: best-pkging-practices.dbk:1748
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
@@ -3867,7 +3737,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1821
+#: best-pkging-practices.dbk:1755
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<filename><replaceable>packagename</replaceable>-<replaceable>upstream-"
@@ -3881,7 +3751,7 @@ msgstr ""
 "Cela permet de distinguer les sources originelles des sources reconstruites ;"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1829
+#: best-pkging-practices.dbk:1763
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
@@ -3890,12 +3760,12 @@ msgstr ""
 "maximal."
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1770
 msgid "Changing binary files"
 msgstr "Modification de fichier binaire"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1838
+#: best-pkging-practices.dbk:1772
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "
@@ -3920,13 +3790,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1853
+#: best-pkging-practices.dbk:1787
 msgid "Best practices for debug packages"
 msgstr "Meilleures pratiques pour les paquets de débogage"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1855
+#: best-pkging-practices.dbk:1789
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that <command>gdb</command> can use.  Since Debian "
@@ -3948,7 +3818,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1863
+#: best-pkging-practices.dbk:1797
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
@@ -3973,7 +3843,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1873
+#: best-pkging-practices.dbk:1807
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
@@ -4001,7 +3871,7 @@ msgstr ""
 "filename> sont dans <filename>/usr/lib/debug/usr/lib/libtruc.so.1</filename>."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1819
 msgid ""
 "The debugging symbols can be extracted from an object file using "
 "<command>objcopy --only-keep-debug</command>.  Then the object file can be "
@@ -4020,7 +3890,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1893
+#: best-pkging-practices.dbk:1827
 msgid ""
 "The <command>dh_strip</command> command in <systemitem role=\"package"
 "\">debhelper</systemitem> supports creating debug packages, and can take "
@@ -4040,7 +3910,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1900
+#: best-pkging-practices.dbk:1834
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
@@ -4050,19 +3920,19 @@ msgstr ""
 "spécifique à la version. Par exemple"
 
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1904
+#: best-pkging-practices.dbk:1838
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr "Depends: libtruc (= ${binary:Version})\n"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1908
+#: best-pkging-practices.dbk:1842
 msgid "Best practices for meta-packages"
 msgstr "Meilleures pratiques pour les métapaquets"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1910
+#: best-pkging-practices.dbk:1844
 msgid ""
 "A meta-package is a mostly empty package that makes it easy to install a "
 "coherent set of packages that can evolve over time. It achieves this by "
@@ -4091,7 +3961,7 @@ msgstr ""
 "systemitem>)."
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1924
+#: best-pkging-practices.dbk:1858
 msgid ""
 "The long description of the meta-package must clearly document its purpose "
 "so that the user knows what he will lose if he removes the package. Being "
@@ -4109,3 +3979,180 @@ msgstr ""
 "l'utilisateur. Ils ont tendance à être importants pour garantir les mises à "
 "niveau du système et la description devrait essayer de dissuader "
 "l'utilisateur de les désinstaller pour éviter d'éventuels dommages."
+
+# type: Content of: <chapter><section><section><section><para>
+#~ msgid ""
+#~ "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. "
+#~ "The first method does <emphasis>preventive</emphasis> search and replace "
+#~ "actions in the PO files. The latter uses <command>gettext</command> "
+#~ "utilities to <emphasis>unfuzzy</emphasis> strings."
+#~ msgstr ""
+#~ "Pour rendre les traductions à nouveau complètes (« <emphasis>unfuzzy</"
+#~ "emphasis> »), deux méthodes existent. La première, <emphasis>préventive</"
+#~ "emphasis>, effectue recherche et remplacement dans le fichier PO. La "
+#~ "seconde utilise <command>gettext</command> pour rendre des chaînes à "
+#~ "nouveau complètes (« <emphasis>unfuzzy</emphasis> »)."
+
+# type: Content of: <chapter><section><section><section><para>
+#~ msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
+#~ msgstr "Méthode <emphasis>préventive</emphasis> :"
+
+# type: Content of: <chapter><section><section><section><para>
+#~ msgid ""
+#~ "Try finding a complete translation file <emphasis role=\"strong\">before</"
+#~ "emphasis> the change:"
+#~ msgstr ""
+#~ "essayer de trouver un fichier de traduction complet <emphasis role="
+#~ "\"strong\">avant</emphasis> la modification :"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#~ msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+#~ msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "The file only showing <emphasis>translated</emphasis> items will be used "
+#~ "as the reference file. If there is none (which should not happen if you "
+#~ "take care to properly interact with translators), you should use the file "
+#~ "with the most translated strings."
+#~ msgstr ""
+#~ "Le fichier ne montrant que des messages <emphasis>traduits</emphasis> "
+#~ "sera utilisé comme fichier de référence. S'il n'y en a aucun (ce qui ne "
+#~ "devrait pas arriver si vous collaborez correctement avec les "
+#~ "traducteurs), vous devriez utiliser le fichier qui contient le plus de "
+#~ "messages traduits ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Identify the needed change. In this example, let's assume the change is "
+#~ "about fixing a typo in the word <literal>typo</literal> which was "
+#~ "inadvertently written as <literal>tpyo</literal>. Therefore, the change "
+#~ "is <command>s/tpyo/typo</command>."
+#~ msgstr ""
+#~ "identifier la modification nécessaire. Dans l'exemple suivant, supposons "
+#~ "que la modification est une correction de faute de frappe dans le mot "
+#~ "« <literal>typo</literal> » qui a été écrit « <literal>tpyo</literal> » "
+#~ "par mégarde. Par conséquent, la modification est <command>s/tpyo/typo</"
+#~ "command> ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Check that this change is only applied to the place where you really "
+#~ "intend to make it and <emphasis role=\"strong\">not</emphasis> in any "
+#~ "other place where the original string is appropriate. This specifically "
+#~ "applies to change in punctuation, for instance."
+#~ msgstr ""
+#~ "vérifier que la modification ne s'applique bien que là où il faut et "
+#~ "<emphasis role=\"strong\">pas</emphasis> ailleurs, où la chaîne d'origine "
+#~ "est appropriée. Cette remarque s'applique en particulier aux "
+#~ "modifications de ponctuation ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Modify all PO files by using <command>sed</command>. The use of that "
+#~ "command is recommended over any text editor to guarantee that the files "
+#~ "encoding will not be broken by the edit action:"
+#~ msgstr ""
+#~ "modifier tous les fichiers PO avec <command>sed</command>. L'utilisation "
+#~ "de cette commande est recommandée par rapport à n'importe quel éditeur de "
+#~ "texte pour garantir que l'encodage des fichiers soit respecté lors de la "
+#~ "modification :"
+
+#~ msgid ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+#~ msgstr ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid "Run <command>debconf-updatepo</command>."
+#~ msgstr "exécuter la commande <command>debconf-updatepo</command> ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Check the <filename>foo.po</filename> reference file. Its statistics "
+#~ "should not be changed:"
+#~ msgstr ""
+#~ "vérifier le fichier <filename>truc.po</filename> de référence, ses "
+#~ "statistiques devraient être identiques :"
+
+#~ msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+#~ msgstr "msgfmt -o /dev/null --statistics debian/po/truc.po\n"
+
+#~ msgid ""
+#~ "If the file's statistics changed, you did something wrong. Try again or "
+#~ "ask for help on the &email-debian-i18n; mailing list."
+#~ msgstr ""
+#~ "si les statistiques du fichier ont changé, vous avez commis une erreur. "
+#~ "Essayez de nouveau ou demandez de l'aide sur la liste de diffusion &email-"
+#~ "debian-i18n;."
+
+# type: Content of: <chapter><section><section><section><para>
+#~ msgid "Gettext utilities method:"
+#~ msgstr "Méthode <systemitem role=\"package\">gettext</systemitem> :"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Put all incomplete PO files out of the way.  You can check the "
+#~ "completeness by using (needs the <systemitem role=\"package\">gettext</"
+#~ "systemitem> package installed):"
+#~ msgstr ""
+#~ "déplacer les fichiers PO incomplets à un endroit temporaire. Les fichiers "
+#~ "peuvent être contrôlés avec la commande suivante (qui nécessite "
+#~ "l'installation du paquet <systemitem role=\"package\">gettext</"
+#~ "systemitem>) :"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Move all files which report either fuzzy strings to a temporary place.  "
+#~ "Files which report no fuzzy strings (only translated and untranslated) "
+#~ "will be kept in place."
+#~ msgstr ""
+#~ "déplacer tous les fichiers qui comportent des chaînes approximatives "
+#~ "(« <literal>fuzzy</literal> ») dans un répertoire temporaire. Les "
+#~ "fichiers qui ne comportent aucune chaîne approximative (seulement des "
+#~ "chaînes traduites ou non traduites) peuvent être laissés en place ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Now <emphasis role=\"strong\">and now only</emphasis>, modify the "
+#~ "template for the typos and check again that translation are not impacted "
+#~ "(typos, spelling errors, sometimes typographical corrections are usually "
+#~ "OK)."
+#~ msgstr ""
+#~ "maintenant <emphasis role=\"strong\">et pas avant</emphasis>, vous pouvez "
+#~ "corriger le fichier d'écrans <systemitem role=\"package\">debconf</"
+#~ "systemitem> (<filename>templates</filename>) en vous assurant à nouveau "
+#~ "que les traductions ne risquent pas d'être affectées (des fautes de "
+#~ "frappes, des erreurs grammaticales et certaines erreurs typographiques ne "
+#~ "posent en général pas de problèmes) ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
+#~ "modified in translations.  You can see this by running the above again."
+#~ msgstr ""
+#~ "exécuter la commande <command>debconf-updatepo</command>. Cette commande "
+#~ "va rendre approximatives les traductions de toutes les chaînes modifiées. "
+#~ "Cela peut être contrôlé avec la commande ci-dessus à nouveau ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid "Use the following command:"
+#~ msgstr "utiliser la commande suivante :"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#~ msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+#~ msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Move back to <filename>debian/po</filename> the files which showed fuzzy "
+#~ "strings in the first step."
+#~ msgstr ""
+#~ "replacer à nouveau dans <filename>debian/po</filename> les fichiers "
+#~ "contenant des chaînes approximatives à la première étape ;"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid "Run <command>debconf-updatepo</command> again."
+#~ msgstr "exécuter la commande <command>debconf-updatepo</command> à nouveau."
diff --git a/po4a/ja/best-pkging-practices.po b/po4a/ja/best-pkging-practices.po
index 920c1af..c8ec739 100644
--- a/po4a/ja/best-pkging-practices.po
+++ b/po4a/ja/best-pkging-practices.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.7\n"
-"POT-Creation-Date: 2011-12-05 00:59+0900\n"
+"POT-Creation-Date: 2012-01-10 17:50-0400\n"
 "PO-Revision-Date: 2011-12-13 23:18+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
@@ -514,9 +514,9 @@ msgid ""
 "package <replaceable>name</replaceable> and <replaceable>synopsis</"
 "replaceable> into this formula:"
 msgstr ""
-"技術的に言えば、動詞のフレーズに対して、これは名詞のフレーズから文章を差し引いたものです。"
-"パッケージ<replaceable>名</replaceable>と<replaceable>要約</replaceable>を"
-"この決まり文句に代入できるのがよい見つけ方です:"
+"技術的に言えば、動詞のフレーズに対して、これは名詞のフレーズから文章を差し引"
+"いたものです。パッケージ<replaceable>名</replaceable>と<replaceable>要約</"
+"replaceable>をこの決まり文句に代入できるのがよい見つけ方です:"
 
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:240
@@ -534,9 +534,8 @@ msgid ""
 "synopsis into two parts, the first a description of the whole suite and the "
 "second a summary of the package's role within it:"
 msgstr ""
-"関連パッケージ群は、概要を 2 つに分けた別の書き方をした方が良いでしょう。"
-"最初はその組一式の説明文で、その次はその組内でのパッケージの役割のサマリに"
-"します:"
+"関連パッケージ群は、概要を 2 つに分けた別の書き方をした方が良いでしょう。最初"
+"はその組一式の説明文で、その次はその組内でのパッケージの役割のサマリにします:"
 
 #. type: Content of: <chapter><section><section><screen>
 #: best-pkging-practices.dbk:249
@@ -563,11 +562,11 @@ msgid ""
 "replaceable> - <replaceable>role</replaceable>\", the elements should be "
 "phrased so that they fit into the formula:"
 msgstr ""
-"これらの要約が、手が加えられた決まり文句に続きます。パッケージ \"<replaceable>"
-"名</replaceable>\" が、\"<replaceable>プログラム一式</replaceable> (<replaceable>"
-"役割</replaceable>)\" あるいは \"<replaceable>プログラム一式</replaceable> - "
-"<replaceable>役割</replaceable>\" という要約を持つ場合、要素はフレーズに"
-"すべきで、決まり文句に合うようになります:"
+"これらの要約が、手が加えられた決まり文句に続きます。パッケージ "
+"\"<replaceable>名</replaceable>\" が、\"<replaceable>プログラム一式</"
+"replaceable> (<replaceable>役割</replaceable>)\" あるいは \"<replaceable>プロ"
+"グラム一式</replaceable> - <replaceable>役割</replaceable>\" という要約を持つ"
+"場合、要素はフレーズにすべきで、決まり文句に合うようになります:"
 
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:263
@@ -1504,8 +1503,8 @@ msgid ""
 "recommendations for some parts of the distribution (the installation system "
 "for instance)."
 msgstr ""
-"これらのガイドラインは、ディストリビューションの一部 (例えば、インストール"
-"システム) に関する、より明確な推奨と同様に、幾つかの書き方と体裁に関する推奨、"
+"これらのガイドラインは、ディストリビューションの一部 (例えば、インストールシ"
+"ステム) に関する、より明確な推奨と同様に、幾つかの書き方と体裁に関する推奨、"
 "そして debconf の使い方についての一般的な考慮すべき事柄を含んでいます。"
 
 # type: Content of: <chapter><section><section><title>
@@ -1525,7 +1524,8 @@ msgid ""
 msgstr ""
 "debconf が Debian に現れて以来、広く乱用され続けています。そして、debconf の"
 "乱用によって、ちょっとしたものをインストールする前に、大量の質問に答える必要"
-"があることに由来するいくつもの非難が Debian ディストリビューションに寄せられました。"
+"があることに由来するいくつもの非難が Debian ディストリビューションに寄せられ"
+"ました。"
 
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:724
@@ -1538,8 +1538,8 @@ msgstr ""
 "使い方のメモは載せるべきところへ載せましょう: <filename>NEWS.Debian</"
 "filename>、または <filename>README.Debian</filename> ファイルです。notes は"
 "パッケージのユーザビリティに直接影響する重要な記述にだけ使いましょう。notes "
-"は確認する (あるいはメールでユーザを悩ます) まで、インストールを常にブロックすること"
-"を覚えておいてください。"
+"は確認する (あるいはメールでユーザを悩ます) まで、インストールを常にブロック"
+"することを覚えておいてください。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
@@ -1650,10 +1650,10 @@ msgid ""
 "When changes are small enough, the original translation is kept in PO files "
 "but marked as <literal>fuzzy</literal>."
 msgstr ""
-"テンプレートを頻繁に変更しすぎることを避けましょう。テンプレート文の変更は、翻"
-"訳を fuzzy にして、さらなる作業を翻訳作業者に強います。fuzzy になっている翻訳"
-"文は、翻訳されてから元の文章が変更された文字列であり、使えるようにする"
-"には翻訳作業者による若干の更新が必要なものです。変更点が十分に小さい場合、"
+"テンプレートを頻繁に変更しすぎることを避けましょう。テンプレート文の変更は、"
+"翻訳を fuzzy にして、さらなる作業を翻訳作業者に強います。fuzzy になっている翻"
+"訳文は、翻訳されてから元の文章が変更された文字列であり、使えるようにするには"
+"翻訳作業者による若干の更新が必要なものです。変更点が十分に小さい場合、"
 "<literal>fuzzy</literal> とマークされますが、元の翻訳文は PO ファイル中に保持"
 "されます。"
 
@@ -1720,11 +1720,11 @@ msgid ""
 "considered as unreasonable. A shorter delay puts too much pressure on "
 "translation teams and should be kept for very minor changes."
 msgstr ""
-"翻訳作業者に締切りを伝えるのは常にお勧めです。それによって、彼らは作業を調"
-"整できます。いくつかの翻訳作業チームは形式化された翻訳／レビュープロセスを"
-"整えており、10 日未満の猶予は不合理であると考えられています。より短い"
-"猶予期間は強すぎるプレッシャーを翻訳チームに与えるので、非常に些細な変更点に"
-"対してのみに留めるべきです。"
+"翻訳作業者に締切りを伝えるのは常にお勧めです。それによって、彼らは作業を調整"
+"できます。いくつかの翻訳作業チームは形式化された翻訳／レビュープロセスを整え"
+"ており、10 日未満の猶予は不合理であると考えられています。より短い猶予期間は強"
+"すぎるプレッシャーを翻訳チームに与えるので、非常に些細な変更点に対してのみに"
+"留めるべきです。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1768,213 +1768,107 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:833
 msgid ""
-"To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
-"first method does <emphasis>preventive</emphasis> search and replace actions "
-"in the PO files. The latter uses <command>gettext</command> utilities to "
-"<emphasis>unfuzzy</emphasis> strings."
+"To <emphasis>unfuzzy</emphasis> translations, you can use "
+"<command>msguntypot</command> (part of the <systemitem role=\"package"
+"\">po4a</systemitem> package)."
 msgstr ""
-"翻訳から <emphasis>fuzzy を取り除く</emphasis>場合、2 つの方法を選ぶことがで"
-"きます。1 つ目のやり方は<emphasis>preventive</emphasis> 検索を行い、PO ファイ"
-"ル中で置換作業を行います。もう一つのやり方は、<emphasis>fuzzy 文字列を取り除"
-"く</emphasis>のに <command>gettext</command> ユーティリティを使います。"
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:839
-msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
-msgstr "<emphasis>fuzzy の予防</emphasis> 方法:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:844
-msgid ""
-"Try finding a complete translation file <emphasis role=\"strong\">before</"
-"emphasis> the change:"
+#: best-pkging-practices.dbk:840
+msgid "Regenerate the POT and PO files."
 msgstr ""
-"変更<emphasis role=\"strong\">前</emphasis>に完全な翻訳ファイルを見つけるよう"
-"にしてください:"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:918
+#: best-pkging-practices.dbk:842 best-pkging-practices.dbk:865
 #, no-wrap
-msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
-
-#FIXME-trans: 訳を再度見直す
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:849
-msgid ""
-"The file only showing <emphasis>translated</emphasis> items will be used as "
-"the reference file. If there is none (which should not happen if you take "
-"care to properly interact with translators), you should use the file with "
-"the most translated strings."
+msgid "debconf-updatepo"
 msgstr ""
-"<emphasis>翻訳済み</emphasis>の項目のみを表示しているファイルは、参照ファイルとして"
-"扱われるようになります。何もなければ (もし、あなたが翻訳作業者と対応するのに適切に"
-"気を配っていたならば起こるはずがありません)、ほぼ翻訳されている文字列を含んだファイル"
-"を使います。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:857
-msgid ""
-"Identify the needed change. In this example, let's assume the change is "
-"about fixing a typo in the word <literal>typo</literal> which was "
-"inadvertently written as <literal>tpyo</literal>. Therefore, the change is "
-"<command>s/tpyo/typo</command>."
+#: best-pkging-practices.dbk:846
+msgid "Make a copy of the POT file."
 msgstr ""
-"必要な変更を認識します。この例では、文字列 <literal>typo</literal> が不注意に"
-"も <literal>tpyo</literal> として書かれている誤字の修正の変更であると仮定して"
-"みましょう。そのため、変更は <command>s/tpyo/typo</command> です。"
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:865
-msgid ""
-"Check that this change is only applied to the place where you really intend "
-"to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
-"where the original string is appropriate. This specifically applies to "
-"change in punctuation, for instance."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:848
+#, no-wrap
+msgid "cp templates.pot templates.pot.orig"
 msgstr ""
-"この変更が本当に意図した場所だけに適用されて、元々の文字列が適切な他の場所に"
-"は<emphasis role=\"strong\">適用されない</emphasis> ことを確認しましょう。例"
-"えば、これは特に句読点の変更に当てはまります。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:873
-msgid ""
-"Modify all PO files by using <command>sed</command>. The use of that command "
-"is recommended over any text editor to guarantee that the files encoding "
-"will not be broken by the edit action:"
+#: best-pkging-practices.dbk:852
+msgid "Make a copy of all the PO files."
 msgstr ""
-"すべての PO ファイルを <command>sed</command> を使って変更してください。編集"
-"作業によってファイルのエンコーディングがこわされないことを保証するため、どの"
-"テキストエディタよりもこのコマンドの利用を推奨します。"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:878
+#: best-pkging-practices.dbk:854
 #, no-wrap
-msgid ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+msgid "mkdir po_fridge; cp *.po po_fridge"
 msgstr ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:884
-msgid "Change the debconf template file to fix the typo."
+#: best-pkging-practices.dbk:858
+#, fuzzy
+#| msgid "Change the debconf template file to fix the typo."
+msgid "Change the debconf template files to fix the typos."
 msgstr "debconf テンプレートファイルを誤字修正のために変更する。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:889
-msgid "Run <command>debconf-updatepo</command>."
-msgstr "<command>debconf-updatepo</command> を実行する。"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:894
-msgid ""
-"Check the <filename>foo.po</filename> reference file. Its statistics should "
-"not be changed:"
+#: best-pkging-practices.dbk:863
+msgid "Regenerate the POT and PO files (again)."
 msgstr ""
-"<filename>foo.po</filename> 参照ファイルをチェックする。統計は変化がないはず"
-"です:"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:898
-#, no-wrap
-msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
-msgstr "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:903
+#: best-pkging-practices.dbk:867
 msgid ""
-"If the file's statistics changed, you did something wrong. Try again or ask "
-"for help on the &email-debian-i18n; mailing list."
+"At this point, the typo fix fuzzied all the translations, and this "
+"unfortunate change is the only one between the PO files of your main "
+"directory and the one from the fridge. Here is how to solve this."
 msgstr ""
-"ファイルの統計が変化していた場合、何かしら間違ったことをやっています。再度"
-"やってみるか、&email-debian-i18n; メーリングリストで助けを求めましょう。"
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:909
-msgid "Gettext utilities method:"
-msgstr "gettext ユーティリティを使う方法:"
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:914
-msgid ""
-"Put all incomplete PO files out of the way.  You can check the completeness "
-"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
-"package installed):"
+#: best-pkging-practices.dbk:874
+msgid "Discard fuzzy translation, restore the ones from the fridge."
 msgstr ""
-"不完全な PO ファイルすべてをどけておきましょう。以下の様にすれば達成度を"
-"チェックできます (<systemitem role=\"package\">gettext</systemitem> パッケー"
-"ジがインストールされている必要があります):"
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:922
-msgid ""
-"Move all files which report either fuzzy strings to a temporary place.  "
-"Files which report no fuzzy strings (only translated and untranslated) will "
-"be kept in place."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:876
+#, no-wrap
+msgid "cp po_fridge/*.po ."
 msgstr ""
-"fuzzy 文字列を報告してきたすべてのファイルを一時的な場所へ移動しましょう。何"
-"も fuzzy 文字列を報告しないファイル (翻訳済と未訳のみ) はそこに置いたままにし"
-"ておきます。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:929
+#: best-pkging-practices.dbk:880
 msgid ""
-"Now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
-"for the typos and check again that translation are not impacted (typos, "
-"spelling errors, sometimes typographical corrections are usually OK)."
+"Manually merge the PO files with the new POT file, but taking the useless "
+"fuzzy into account."
 msgstr ""
-"今、<emphasis role=\"strong\">そうたった今</emphasis>、誤字の修正のためにテン"
-"プレートに手を入れて翻訳が影響を受けていないことを再確認しましょう (誤字、ス"
-"ペルミス、時には文言の修正なども大抵は OK です)。"
 
-#FIXME-trans: You can see this by running the above again. の訳
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:936
-msgid ""
-"Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
-"modified in translations.  You can see this by running the above again."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:882
+#, no-wrap
+msgid "msguntypot -o templates.pot.orig -n templates.pot *.po"
 msgstr ""
-"<command>debconf-updatepo</command> を実行します。これは、翻訳中であなたが変"
-"更したすべての文字列を fuzzy にします。上記を再度実行すれば、これを見ることができます。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:942
-msgid "Use the following command:"
-msgstr "以下のコマンドを利用してください:"
+#: best-pkging-practices.dbk:886
+msgid "Clean up."
+msgstr ""
 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:944
+#: best-pkging-practices.dbk:888
 #, no-wrap
-msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:948
-msgid ""
-"Move back to <filename>debian/po</filename> the files which showed fuzzy "
-"strings in the first step."
+msgid "rm -rf templates.pot.orig po_fridge"
 msgstr ""
-"最初の手順で fuzzy 文字列を表示していた <filename>debian/po</filename> のファ"
-"イルに戻ってください。"
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:953
-msgid "Run <command>debconf-updatepo</command> again."
-msgstr "再度 <command>debconf-updatepo</command> を実行してください。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:960
+#: best-pkging-practices.dbk:894
 msgid "Do not make assumptions about interfaces"
 msgstr "インターフェイスについて仮定をしない"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:962
+#: best-pkging-practices.dbk:896
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer Yes...</"
@@ -1988,37 +1882,37 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:901
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
 "users.  Also, because these default values may be different from the "
 "maintainer choices (for instance, when the debconf database was preseeded)."
 msgstr ""
-"文字列テンプレートは、説明文中でのデフォルト値について言及することも避けましょ"
-"う。まず、ユーザによってそして、デフォルト値はメンテナの考え方によって違う場"
-"合があるからです (たとえば、debconf データベースが preseed で指定されている場"
-"合など)。"
+"文字列テンプレートは、説明文中でのデフォルト値について言及することも避けま"
+"しょう。まず、ユーザによってそして、デフォルト値はメンテナの考え方によって違"
+"う場合があるからです (たとえば、debconf データベースが preseed で指定されてい"
+"る場合など)。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:907
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
-"より一般的に言うと、ユーザの行動を参照させるのを避けるようにしましょう。"
-"単に事実を与えましょう。"
+"より一般的に言うと、ユーザの行動を参照させるのを避けるようにしましょう。単に"
+"事実を与えましょう。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:979
+#: best-pkging-practices.dbk:913
 msgid "Do not use first person"
 msgstr "一人称を使わない"
 
 # speak for
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:981
+#: best-pkging-practices.dbk:915
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 "emphasis> or <emphasis>We recommend...</emphasis>).  The computer is not a "
@@ -2039,13 +1933,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:991
+#: best-pkging-practices.dbk:925
 msgid "Be gender neutral"
 msgstr "性差に対して中立であれ"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:993
+#: best-pkging-practices.dbk:927
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
@@ -2055,13 +1949,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1001
+#: best-pkging-practices.dbk:935
 msgid "Templates fields definition"
 msgstr "テンプレートのフィールド定義"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1003
+#: best-pkging-practices.dbk:937
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
@@ -2073,31 +1967,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1008
+#: best-pkging-practices.dbk:942
 msgid "Type"
 msgstr "Type"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1010
+#: best-pkging-practices.dbk:944
 msgid "string"
 msgstr "string"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1012
+#: best-pkging-practices.dbk:946
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 "ユーザがどのような文字列でも記述可能な自由記述形式の入力フィールドの結果。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1017
+#: best-pkging-practices.dbk:951
 msgid "password"
 msgstr "password"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1019
+#: best-pkging-practices.dbk:953
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
@@ -2109,13 +2003,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1026
+#: best-pkging-practices.dbk:960
 msgid "boolean"
 msgstr "boolean"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:962
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
@@ -2124,12 +2018,12 @@ msgstr ""
 "\">yes/no ではありません</emphasis>..."
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1034
+#: best-pkging-practices.dbk:968
 msgid "select"
 msgstr "select"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1036
+#: best-pkging-practices.dbk:970
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
@@ -2140,7 +2034,7 @@ msgstr ""
 "以下のようになります: <literal>Choices: yes, no, maybe</literal>"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1041
+#: best-pkging-practices.dbk:975
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
@@ -2151,17 +2045,18 @@ msgstr ""
 "しょう。2つのアンダースコアは、各選択肢を分かれた文字列に分割してくれます。"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1046
+#: best-pkging-practices.dbk:980
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
 "as translatable.  Example:"
 msgstr ""
-"<command>po-debconf</command> システムは、翻訳可能な<emphasis role=\"strong\">"
-"いくつかの</emphasis>選択肢のみをマークする面白い機能を提供してくれます。例:"
+"<command>po-debconf</command> システムは、翻訳可能な<emphasis role=\"strong"
+"\">いくつかの</emphasis>選択肢のみをマークする面白い機能を提供してくれます。"
+"例:"
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
-#: best-pkging-practices.dbk:1051
+#: best-pkging-practices.dbk:985
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
@@ -2179,7 +2074,7 @@ msgstr ""
 " Please choose the TV standard used in your country.\n"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1059
+#: best-pkging-practices.dbk:993
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
@@ -2190,7 +2085,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1064
+#: best-pkging-practices.dbk:998
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>7</"
@@ -2202,13 +2097,13 @@ msgstr ""
 "て列挙しています。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1072
+#: best-pkging-practices.dbk:1006
 msgid "multiselect"
 msgstr "multiselect"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1008
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
@@ -2217,13 +2112,13 @@ msgstr ""
 "る (あるいはどれも選ばないこともできる) 点だけが違います。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1080
+#: best-pkging-practices.dbk:1014
 msgid "note"
 msgstr "note"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1082
+#: best-pkging-practices.dbk:1016
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
@@ -2232,31 +2127,31 @@ msgid ""
 "mailing the note to them in some cases."
 msgstr ""
 "本来質問ではありませんが、このデータ型が示すのはユーザに表示することができる"
-"覚え書きです。debconf はユーザが必ず参照するようにするため、多大な苦痛を与"
-"えることになる (キーを押すためにインストールを休止したり、ある場合にはメモを"
+"覚え書きです。debconf はユーザが必ず参照するようにするため、多大な苦痛を与え"
+"ることになる (キーを押すためにインストールを休止したり、ある場合にはメモを"
 "メールさえする) ので、ユーザが知っておく必要がある重要な記述にのみ使うべきで"
 "す。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1091
+#: best-pkging-practices.dbk:1025
 msgid "text"
 msgstr "text"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1093
+#: best-pkging-practices.dbk:1027
 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 "この type は現状では古すぎるものと考えられています: 使わないでください。"
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1098
+#: best-pkging-practices.dbk:1032
 msgid "error"
 msgstr "error"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1100
+#: best-pkging-practices.dbk:1034
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
@@ -2269,23 +2164,23 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1105
+#: best-pkging-practices.dbk:1039
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
-"何かを補正するためにユーザの注意を引く必要があるメッセージに対し、この type を使う"
-"のがお勧めです。"
+"何かを補正するためにユーザの注意を引く必要があるメッセージに対し、この type "
+"を使うのがお勧めです。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1047
 msgid "Description: short and extended description"
 msgstr "Description: short および extended 説明文"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1115
+#: best-pkging-practices.dbk:1049
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
@@ -2295,7 +2190,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1053
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accommodated by most debconf interfaces.  Keeping it short also helps "
@@ -2308,7 +2203,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1059
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
@@ -2322,7 +2217,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1131
+#: best-pkging-practices.dbk:1065
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
@@ -2332,7 +2227,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1135
+#: best-pkging-practices.dbk:1069
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
@@ -2348,7 +2243,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1142
+#: best-pkging-practices.dbk:1076
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
@@ -2360,7 +2255,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1081
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
@@ -2374,7 +2269,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1153
+#: best-pkging-practices.dbk:1087
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
@@ -2384,7 +2279,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1091
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
@@ -2394,12 +2289,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1163
+#: best-pkging-practices.dbk:1097
 msgid "Choices"
 msgstr "Choices"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1165
+#: best-pkging-practices.dbk:1099
 msgid ""
 "This field should be used for select and multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
@@ -2411,13 +2306,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1172
+#: best-pkging-practices.dbk:1106
 msgid "Default"
 msgstr "Default"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1174
+#: best-pkging-practices.dbk:1108
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
@@ -2429,35 +2324,35 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1183
+#: best-pkging-practices.dbk:1117
 msgid "Templates fields specific style guide"
 msgstr "テンプレートのフィールド固有スタイルガイド"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1185
+#: best-pkging-practices.dbk:1119
 msgid "Type field"
 msgstr "Type フィールド"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1121
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
-"特別な指定はありません。一点だけ、その前のセクションを参照して適切な type を使っ"
-"てください。"
+"特別な指定はありません。一点だけ、その前のセクションを参照して適切な type を"
+"使ってください。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1127
 msgid "Description field"
 msgstr "Description フィールド"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1195
+#: best-pkging-practices.dbk:1129
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
@@ -2467,57 +2362,58 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1199
+#: best-pkging-practices.dbk:1133
 msgid "String/password templates"
 msgstr "String/password テンプレート"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1203
+#: best-pkging-practices.dbk:1137
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "
 "opened prompts (IP address:).  The use of colons is recommended."
 msgstr ""
-"短い説明文は、プロンプトであってタイトルでは<emphasis role=\"strong\">ありません</"
-"emphasis>。質問形式のプロンプト (IP アドレスは?) を避け、代わりに閉じていない形のプロ"
-"ンプト (IP アドレス:) を使ってください。コロン (:) の使用をお勧めします。"
+"短い説明文は、プロンプトであってタイトルでは<emphasis role=\"strong\">ありま"
+"せん</emphasis>。質問形式のプロンプト (IP アドレスは?) を避け、代わりに閉じて"
+"いない形のプロンプト (IP アドレス:) を使ってください。コロン (:) の使用をお勧"
+"めします。"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1210
+#: best-pkging-practices.dbk:1144
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
 "question again using longer words.  Use complete sentences.  Terse writing "
 "style is strongly discouraged."
 msgstr ""
-"拡張された説明文は、短い説明文を補足します。拡張の部分では、長い文章"
-"を使って同じ質問を繰り返すのではなく、何を質問されているのかを説明します。完"
-"全な文章を書いてください。簡潔な書き方は強く忌避されます。"
+"拡張された説明文は、短い説明文を補足します。拡張の部分では、長い文章を使って"
+"同じ質問を繰り返すのではなく、何を質問されているのかを説明します。完全な文章"
+"を書いてください。簡潔な書き方は強く忌避されます。"
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1220
+#: best-pkging-practices.dbk:1154
 msgid "Boolean templates"
 msgstr "Boolean テンプレート"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1224
+#: best-pkging-practices.dbk:1158
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
 "writing style is permitted and even encouraged if the question is rather "
 "long (remember that translations are often longer than original versions)."
 msgstr ""
-"短い説明文は、短いままで大抵の場合は ? で終わる質問の体裁の言い回しをせねば"
-"なりません。簡潔な書き方は許されており、質問が若干長い場合は推奨されすらしています "
-"(翻訳文は、大抵の場合原文よりも長くなるのを覚えておきましょう)。"
+"短い説明文は、短いままで大抵の場合は ? で終わる質問の体裁の言い回しをせねばな"
+"りません。簡潔な書き方は許されており、質問が若干長い場合は推奨されすらしてい"
+"ます (翻訳文は、大抵の場合原文よりも長くなるのを覚えておきましょう)。"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1232
+#: best-pkging-practices.dbk:1166
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
@@ -2528,46 +2424,46 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1240
+#: best-pkging-practices.dbk:1174
 msgid "Select/Multiselect"
 msgstr "Select/Multiselect"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1244
+#: best-pkging-practices.dbk:1178
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "
 "Please choose...  constructions.  Users are clever enough to figure out they "
 "have to choose something...:)"
 msgstr ""
-"短い説明文は、プロンプトであってタイトルでは<emphasis role=\"strong\">ありませ"
-"ん</emphasis>。「Please choose...」のような意味の無い文章を文章を<emphasis "
+"短い説明文は、プロンプトであってタイトルでは<emphasis role=\"strong\">ありま"
+"せん</emphasis>。「Please choose...」のような意味の無い文章を文章を<emphasis "
 "role=\"strong\">使わないで</emphasis>ください。ユーザは何かを選ぶ必要があるく"
 "らいには十分賢いです... :)"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1252
+#: best-pkging-practices.dbk:1186
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
 "than one of the available choices, if the template is a multiselect one "
 "(although the interface often makes this clear)."
 msgstr ""
-"拡張された説明文は、短い説明文を完備します。これでは、利用可能な選択肢に言及する"
-"ことがあります。テンプレートが multiselect なものの場合、ユーザが選べる選択肢が 1 つ"
-"ではないことについても言及するかもしれません (インターフェイスが大抵これを明確"
-"にはしてくれますが)。"
+"拡張された説明文は、短い説明文を完備します。これでは、利用可能な選択肢に言及"
+"することがあります。テンプレートが multiselect なものの場合、ユーザが選べる選"
+"択肢が 1 つではないことについても言及するかもしれません (インターフェイスが大"
+"抵これを明確にはしてくれますが)。"
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1262
+#: best-pkging-practices.dbk:1196
 msgid "Notes"
 msgstr "Note"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1266
+#: best-pkging-practices.dbk:1200
 msgid ""
 "The short description should be considered to be a <emphasis role=\"strong"
 "\">title</emphasis>."
@@ -2576,7 +2472,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1205
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
@@ -2585,7 +2481,7 @@ msgstr ""
 "ない書き方です。"
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1277
+#: best-pkging-practices.dbk:1211
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
@@ -2597,9 +2493,9 @@ msgid ""
 "keeping existing translations for the future."
 msgstr ""
 "<emphasis role=\"strong\">debconf を乱用しないでください。</emphasis> note "
-"は、debconf の乱用で最も良く使われます。debconf-devel マニュアルペー"
-"ジに書かれています: とても深刻な問題について警告する場合のみに使うのがベスト"
-"です。多くの覚え書きについては、<filename>NEWS.Debian</filename> ファイルや "
+"は、debconf の乱用で最も良く使われます。debconf-devel マニュアルページに書か"
+"れています: とても深刻な問題について警告する場合のみに使うのがベストです。多"
+"くの覚え書きについては、<filename>NEWS.Debian</filename> ファイルや "
 "<filename>README.Debian</filename> ファイルが適切な場所です。もし、これを読ん"
 "で、Note 型のテンプレートを <filename>NEWS.Debian</filename> あるいは "
 "<filename>README.Debian</filename> 中のエントリに変換することを考えた場合、既"
@@ -2607,13 +2503,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1292
+#: best-pkging-practices.dbk:1226
 msgid "Choices field"
 msgstr "Choices フィールド"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1294
+#: best-pkging-practices.dbk:1228
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
@@ -2625,12 +2521,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1235 best-pkging-practices.dbk:1273
 msgid "Default field"
 msgstr "Default フィールド"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1303
+#: best-pkging-practices.dbk:1237
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
@@ -2641,7 +2537,7 @@ msgstr ""
 "等) 。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1242
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
@@ -2655,13 +2551,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1314
+#: best-pkging-practices.dbk:1248
 msgid "Example, taken from the geneweb package templates:"
 msgstr "geneweb パッケージのテンプレートを例にとってみましょう:"
 
 # 日本語が無かったので、適当に追加しました…
 #. type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:1317
+#: best-pkging-practices.dbk:1251
 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
@@ -2686,18 +2582,18 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1328
+#: best-pkging-practices.dbk:1262
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
 "will work with."
 msgstr ""
-"ブラケットを使うと、debconf のフィールド中に内部コメントができることに注意して"
-"ください。コメントの利用は、翻訳作業者が作業するファイルに表示されるのにも注"
-"意ください。"
+"ブラケットを使うと、debconf のフィールド中に内部コメントができることに注意し"
+"てください。コメントの利用は、翻訳作業者が作業するファイルに表示されるのにも"
+"注意ください。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1267
 msgid ""
 "The comments are needed as the _Default trick is a bit confusing: the "
 "translators may put their own choice"
@@ -2707,7 +2603,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1341
+#: best-pkging-practices.dbk:1275
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
@@ -2716,7 +2612,7 @@ msgstr ""
 "いのであれば、Default は使うべきではありません。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1345
+#: best-pkging-practices.dbk:1279
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see <xref linkend=\"s6.5.2.2\"/>), consider making this field translatable, "
@@ -2727,7 +2623,7 @@ msgstr ""
 "るのであれば、翻訳可能な状態にするのを検討しましょう。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1350
+#: best-pkging-practices.dbk:1284
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
@@ -2741,12 +2637,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1362
+#: best-pkging-practices.dbk:1296
 msgid "Internationalization"
 msgstr "国際化"
 
 #. type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:1364
+#: best-pkging-practices.dbk:1298
 msgid ""
 "This section contains global information for developers to make translators' "
 "life easier.  More information for translators and developers interested in "
@@ -2760,13 +2656,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1371
+#: best-pkging-practices.dbk:1305
 msgid "Handling debconf translations"
 msgstr "debconf の翻訳を取り扱う"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1373
+#: best-pkging-practices.dbk:1307
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
@@ -2780,7 +2676,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1379
+#: best-pkging-practices.dbk:1313
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
@@ -2795,13 +2691,13 @@ msgstr ""
 "にとってパッケージ設定を簡単にすることでした。元々、debconf テンプレートの翻"
 "訳は<command>debconf-mergetemplate</command> で行われていました。しかし、この"
 "やり方は現在は非推奨 (deprecated) です; <systemitem role=\"package"
-"\">debconf</systemitem> の国際化を成し遂げる最も良いやり方は、"
-"<systemitem role=\"package\">po-debconf</systemitem> パッケージを使うことで"
-"す。このやり方はメンテナと翻訳者の双方にとって、より楽なやり方です; 移行スク"
-"リプトが提供されています。"
+"\">debconf</systemitem> の国際化を成し遂げる最も良いやり方は、<systemitem "
+"role=\"package\">po-debconf</systemitem> パッケージを使うことです。このやり方"
+"はメンテナと翻訳者の双方にとって、より楽なやり方です; 移行スクリプトが提供さ"
+"れています。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1389
+#: best-pkging-practices.dbk:1323
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>.po</filename> files (drawing from <command>gettext</"
@@ -2817,35 +2713,36 @@ msgid ""
 msgstr ""
 "<systemitem role=\"package\">po-debconf</systemitem> を使うと、翻訳は "
 "<filename>.po</filename> ファイルに収められます (<command>gettext</command> "
-"による翻訳技術からの引き出しです)。特別なテンプレートファイルには、元の文章と、"
-"どのフィールドが翻訳可能かがマークされています。翻訳可能なフィールドの値を"
-"変更すると、<command>debconf-updatepo</command> を呼び出すことで、翻訳作業者"
-"の注意が必要なように翻訳にマークがされます。そして、生成時には <command>"
-"dh_installdebconf</command> プログラムが、テンプレートに加え、最新の翻訳を"
-"バイナリパッケージに追加するのに必要となる魔法について、すべての面倒を見ます。"
-"詳細は <citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>"
-"7</manvolnum> </citerefentry> マニュアルページを参照してください。"
+"による翻訳技術からの引き出しです)。特別なテンプレートファイルには、元の文章"
+"と、どのフィールドが翻訳可能かがマークされています。翻訳可能なフィールドの値"
+"を変更すると、<command>debconf-updatepo</command> を呼び出すことで、翻訳作業"
+"者の注意が必要なように翻訳にマークがされます。そして、生成時には "
+"<command>dh_installdebconf</command> プログラムが、テンプレートに加え、最新の"
+"翻訳をバイナリパッケージに追加するのに必要となる魔法について、すべての面倒を"
+"見ます。詳細は <citerefentry> <refentrytitle>po-debconf</refentrytitle> "
+"<manvolnum>7</manvolnum> </citerefentry> マニュアルページを参照してください。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1405
+#: best-pkging-practices.dbk:1339
 msgid "Internationalized documentation"
 msgstr "ドキュメントの国際化"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1407
+#: best-pkging-practices.dbk:1341
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
 "for translators."
 msgstr ""
-"ドキュメントの国際化はユーザにとって極めて重要ですが、多くの労力がかかります。"
-"この作業をすべて除去する方法はありませんが、翻訳作業者を気楽にはできます。"
+"ドキュメントの国際化はユーザにとって極めて重要ですが、多くの労力がかかりま"
+"す。この作業をすべて除去する方法はありませんが、翻訳作業者を気楽にはできま"
+"す。"
 
 # FIXME: source control sysytem -> source control management system (SCM)?
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1412
+#: best-pkging-practices.dbk:1346
 msgid ""
 "If you maintain documentation of any size, it is easier for translators if "
 "they have access to a source control system.  That lets translators see the "
@@ -2867,15 +2764,15 @@ msgstr ""
 "キュメントは、翻訳作業がどのソースコントロールリビジョンをベースにしているの"
 "かという記録を保持しておくことをお勧めします。<systemitem role=\"package"
 "\">debian-installer</systemitem> パッケージ中の <ulink url=\"&url-i18n-doc-"
-"check;\">doc-check</ulink> では興味深いシステムが提供されています。これは、"
-"翻訳すべき現在のリビジョンのファイルに対する構造化されているコメントを使って、"
-"指定されたあらゆる言語の翻訳状況の概要を表示し、翻訳されたファイルについては、"
-"翻訳がベースにしているオリジナルのファイルのリビジョンを表示します。自分の "
-"VCS 領域でこれを導入して利用した方が良いでしょう。"
+"check;\">doc-check</ulink> では興味深いシステムが提供されています。これは、翻"
+"訳すべき現在のリビジョンのファイルに対する構造化されているコメントを使って、"
+"指定されたあらゆる言語の翻訳状況の概要を表示し、翻訳されたファイルについて"
+"は、翻訳がベースにしているオリジナルのファイルのリビジョンを表示します。自分"
+"の VCS 領域でこれを導入して利用した方が良いでしょう。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1426
+#: best-pkging-practices.dbk:1360
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
@@ -2883,12 +2780,12 @@ msgid ""
 "much easier, for instance, to keep URLs up to date across multiple files."
 msgstr ""
 "XML あるいは SGML のドキュメントをメンテナンスしているのであれば、言語非依存"
-"の情報を分離し、それらをすべての異なった翻訳に含まれる分割されたファイル"
-"にエンティティとして定義した方が良いでしょう。これは、URL を複数のファイル間"
-"で最新に保つなど、作業をより楽にしてくれます。"
+"の情報を分離し、それらをすべての異なった翻訳に含まれる分割されたファイルにエ"
+"ンティティとして定義した方が良いでしょう。これは、URL を複数のファイル間で最"
+"新に保つなど、作業をより楽にしてくれます。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1432
+#: best-pkging-practices.dbk:1366
 msgid ""
 "Some tools (e.g. <systemitem role=\"package\">po4a</systemitem>, <systemitem "
 "role=\"package\">poxml</systemitem>, or the <systemitem role=\"package"
@@ -2906,13 +2803,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1444
+#: best-pkging-practices.dbk:1378
 msgid "Common packaging situations"
 msgstr "パッケージ化に於ける一般的なシチュエーション"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1455
+#: best-pkging-practices.dbk:1389
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 "<command>autoconf</command>/<command>automake</command> を使っているパッケー"
@@ -2920,7 +2817,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1457
+#: best-pkging-practices.dbk:1391
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
@@ -2942,13 +2839,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1469
+#: best-pkging-practices.dbk:1403
 msgid "Libraries"
 msgstr "ライブラリ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1471
+#: best-pkging-practices.dbk:1405
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
@@ -2962,7 +2859,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1477
+#: best-pkging-practices.dbk:1411
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
@@ -2972,13 +2869,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1484
+#: best-pkging-practices.dbk:1418
 msgid "Documentation"
 msgstr "ドキュメント化"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1486
+#: best-pkging-practices.dbk:1420
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
@@ -2989,7 +2886,7 @@ msgstr ""
 # ship は「出荷」の意味だが、Debian の場合は製品ではないので「リリース」とした
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1491
+#: best-pkging-practices.dbk:1425
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
@@ -3002,7 +2899,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1496
+#: best-pkging-practices.dbk:1430
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
@@ -3018,7 +2915,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1503
+#: best-pkging-practices.dbk:1437
 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
@@ -3030,7 +2927,7 @@ msgstr ""
 "参照してください。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1509
+#: best-pkging-practices.dbk:1443
 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "
@@ -3046,7 +2943,7 @@ msgstr ""
 
 # FIXME-Trans: to a lesser extent の訳。
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1516
+#: best-pkging-practices.dbk:1450
 msgid ""
 "The manpages do not need to be written directly in the troff format.  "
 "Popular source formats are Docbook, POD and reST, which can be converted "
@@ -3062,13 +2959,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1525
+#: best-pkging-practices.dbk:1459
 msgid "Specific types of packages"
 msgstr "特定の種類のパッケージ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1527
+#: best-pkging-practices.dbk:1461
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
@@ -3078,7 +2975,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1533
+#: best-pkging-practices.dbk:1467
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="
@@ -3093,7 +2990,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1476
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
@@ -3104,7 +3001,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1549
+#: best-pkging-practices.dbk:1483
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
@@ -3114,7 +3011,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1556
+#: best-pkging-practices.dbk:1490
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
@@ -3124,7 +3021,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1563
+#: best-pkging-practices.dbk:1497
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
@@ -3138,7 +3035,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1571
+#: best-pkging-practices.dbk:1505
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
@@ -3148,7 +3045,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1577
+#: best-pkging-practices.dbk:1511
 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"
@@ -3160,13 +3057,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1607
+#: best-pkging-practices.dbk:1541
 msgid "Architecture-independent data"
 msgstr "アーキテクチャ非依存のデータ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1609
+#: best-pkging-practices.dbk:1543
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
@@ -3181,7 +3078,7 @@ msgstr ""
 "にしておくのがベストでしょう。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1616
+#: best-pkging-practices.dbk:1550
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (<filename>_all.deb</"
@@ -3203,13 +3100,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1628
+#: best-pkging-practices.dbk:1562
 msgid "Needing a certain locale during build"
 msgstr "ビルド中に特定のロケールが必要"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1630
+#: best-pkging-practices.dbk:1564
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
@@ -3219,7 +3116,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1634
+#: best-pkging-practices.dbk:1568
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "
@@ -3232,7 +3129,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1639
+#: best-pkging-practices.dbk:1573
 #, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
@@ -3257,13 +3154,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1652
+#: best-pkging-practices.dbk:1586
 msgid "Make transition packages deborphan compliant"
 msgstr "移行パッケージを deboprhan に適合するようにする"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1654
+#: best-pkging-practices.dbk:1588
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
@@ -3272,14 +3169,14 @@ msgid ""
 "argument, it tries to catch other useless packages."
 msgstr ""
 "deborphan は、どのパッケージがシステムから安全に削除できるか、ユーザが検出す"
-"るのを助けてくれるプログラムです; すなわち、どのパッケージも依存していないもので"
-"す。デフォルトの動作は、使われていないライブラリを見つけ出すために libs と "
-"oldlibs セクションからのみ検索を行います。ですが、正しい引数を渡せば、他の使"
-"われていないパッケージを捕らえようとします。"
+"るのを助けてくれるプログラムです; すなわち、どのパッケージも依存していないも"
+"のです。デフォルトの動作は、使われていないライブラリを見つけ出すために libs "
+"と oldlibs セクションからのみ検索を行います。ですが、正しい引数を渡せば、他の"
+"使われていないパッケージを捕らえようとします。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1661
+#: best-pkging-practices.dbk:1595
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "
@@ -3293,7 +3190,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1668
+#: best-pkging-practices.dbk:1602
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
@@ -3306,7 +3203,7 @@ msgstr ""
 "transitional</command>"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1674
+#: best-pkging-practices.dbk:1608
 msgid ""
 "Also, it is recommended to adjust its section to <literal>oldlibs</literal> "
 "and its priority to <literal>extra</literal> in order to ease "
@@ -3318,29 +3215,30 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1683
+#: best-pkging-practices.dbk:1617
 msgid "Best practices for <filename>.orig.tar.{gz,bz2,xz}</filename> files"
 msgstr ""
 "<filename>.orig.tar.{gz,bz2,xz}</filename> についてのベストプラクティス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1619
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
-"オリジナルのソース tarball には 2 種類あります: 手が入れられていない素のソース (Pristine source) "
-"と再パッケージした開発元のソース (repackaged upstream source) です。"
+"オリジナルのソース tarball には 2 種類あります: 手が入れられていない素のソー"
+"ス (Pristine source) と再パッケージした開発元のソース (repackaged upstream "
+"source) です。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1689
+#: best-pkging-practices.dbk:1623
 msgid "Pristine source"
 msgstr "手が入れられていないソース (Pristine source)"
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1693
+#: best-pkging-practices.dbk:1627
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
@@ -3355,17 +3253,18 @@ msgid ""
 "situation as a bug."
 msgstr ""
 "我々は、配布されている tarball がバージョン番号をインクリメントすることなく、"
-"開発元の作者によって変更されるのを防ぐことはできません。ですので、手が入れられ"
-"ていない素の tarball が、どの時点でも開発元が<emphasis>現在</emphasis>配布して"
-"いると等しいものである保証はありません。期待できることは、一度は配布<emphasis>"
-"された</emphasis>ものと等しいものであるということだけです。後から違いが発生した"
-"場合 (そう、例えば upstream が元々の配布物が最大の圧縮率を使っていなかったことに気づい"
-"て、再度 <command>gzip</command> しなおした場合など)、それはとても残念なことです。"
-"同じバージョンに対して新しい <filename>.orig.tar.{gz,bz2,xz}</filename> をアップ"
-"ロードするのには良い方法がないので、この状況をバグと考える意味はありません。"
+"開発元の作者によって変更されるのを防ぐことはできません。ですので、手が入れら"
+"れていない素の tarball が、どの時点でも開発元が<emphasis>現在</emphasis>配布"
+"していると等しいものである保証はありません。期待できることは、一度は配布"
+"<emphasis>された</emphasis>ものと等しいものであるということだけです。後から違"
+"いが発生した場合 (そう、例えば upstream が元々の配布物が最大の圧縮率を使って"
+"いなかったことに気づいて、再度 <command>gzip</command> しなおした場合など)、"
+"それはとても残念なことです。同じバージョンに対して新しい <filename>.orig.tar."
+"{gz,bz2,xz}</filename> をアップロードするのには良い方法がないので、この状況を"
+"バグと考える意味はありません。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1691
+#: best-pkging-practices.dbk:1625
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "
 "<filename>.orig.tar.{gz,bz2,xz}</filename> file is byte-for-byte identical "
@@ -3376,17 +3275,18 @@ msgid ""
 "upstream authors and others who already have the upstream tarball can save "
 "download time if they want to inspect your packaging in detail."
 msgstr ""
-"素のソース tarball (pristine source tarball) の特徴の定義は、<filename>.orig.tar."
-"{gz,bz2,xz}</filename> は、開発元の作者によって公式に配布された tarball と 1 バイト"
-"たりとも違わない、というものです。<placeholder type=\"footnote\" id=\"0\"/> "
-"これは、Debian diff 内に含まれているDebian バージョンと開発元のバージョン間の"
-"すべての違いを簡単に比較するのにチェックサムを使えるようになります。また、オリジナル"
-"のソースが巨大な場合、既に upstream の tarball を持っている upstream の作者と他の者は、"
-"あなたのパッケージを詳細に調査したい場合、ダウンロード時間を節約できます。"
+"素のソース tarball (pristine source tarball) の特徴の定義は、<filename>.orig."
+"tar.{gz,bz2,xz}</filename> は、開発元の作者によって公式に配布された tarball "
+"と 1 バイトたりとも違わない、というものです。<placeholder type=\"footnote\" "
+"id=\"0\"/> これは、Debian diff 内に含まれているDebian バージョンと開発元の"
+"バージョン間のすべての違いを簡単に比較するのにチェックサムを使えるようになり"
+"ます。また、オリジナルのソースが巨大な場合、既に upstream の tarball を持って"
+"いる upstream の作者と他の者は、あなたのパッケージを詳細に調査したい場合、ダ"
+"ウンロード時間を節約できます。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1711
+#: best-pkging-practices.dbk:1645
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"
@@ -3394,25 +3294,25 @@ msgid ""
 "pristine source.  Its strategy is equivalent to the following:"
 msgstr ""
 "tarball 中のディレクトリ構成に関して開発元の作者が従う、万人に受け入れられて"
-"いるガイドラインというものはありませんが、それにも関わらず <command>dpkg-source"
-"</command> は ほとんどの upstream の tarball を素のソース (pristine source) "
-"として対処できます。そのやり方は以下の通りです:"
+"いるガイドラインというものはありませんが、それにも関わらず <command>dpkg-"
+"source</command> は ほとんどの upstream の tarball を素のソース (pristine "
+"source) として対処できます。そのやり方は以下の通りです:"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1719
+#: best-pkging-practices.dbk:1653
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr "以下のようにして空の一時ディレクトリに tarball を展開します"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: best-pkging-practices.dbk:1722
+#: best-pkging-practices.dbk:1656
 #, no-wrap
 msgid "zcat path/to/<replaceable>packagename</replaceable>_<replaceable>upstream-version</replaceable>.orig.tar.gz | tar xf -\n"
 msgstr "zcat path/to/<replaceable>パッケージ名</replaceable>_<replaceable>開発元のバージョン</replaceable>.orig.tar.gz | tar xf -\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1727
+#: best-pkging-practices.dbk:1661
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
@@ -3427,7 +3327,7 @@ msgstr ""
 "ディレクトリ名は問題にはされず、忘れられます。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1736
+#: best-pkging-practices.dbk:1670
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "
@@ -3435,21 +3335,21 @@ msgid ""
 "<emphasis>itself</emphasis> to <filename><replaceable>packagename</"
 "replaceable>-<replaceable>upstream-version</replaceable>(.orig)</filename>."
 msgstr ""
-"それ以外の場合、upstream の tarball は共通の最上位ディレクトリ無しでパッケージさ"
-"れなくては いけません (upstream の作者よ、恥を知りなさい!)。この場合、"
+"それ以外の場合、upstream の tarball は共通の最上位ディレクトリ無しでパッケー"
+"ジされなくては いけません (upstream の作者よ、恥を知りなさい!)。この場合、"
 "<command>dpkg-source</command> は一時ディレクトリ<emphasis>そのもの</"
 "emphasis>を <filename><replaceable>パッケージ名</replaceable>-<replaceable>開"
 "発元のバージョン</replaceable>(.orig)</filename> へリネームします。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1747
+#: best-pkging-practices.dbk:1681
 msgid "Repackaged upstream source"
 msgstr "upstream のソースをパッケージしなおす"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1749
+#: best-pkging-practices.dbk:1683
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
@@ -3457,14 +3357,14 @@ msgid ""
 "source as gzipped tar at all, or if upstream's tarball contains non-DFSG-"
 "free material that you must remove before uploading."
 msgstr ""
-"パッケージは手が入っていない素のソース tarball と共にアップロード<emphasis role=\"strong\">す"
-"べき</emphasis>ですが、それが可能ではない場合が色々とあります。upstream がソース"
-"を gzip 圧縮した tarball を全く配布していない場合や、upstream の tarball が "
-"DFSG-free ではない、あなたがアップロード前に削除しなければならない素材を含ん"
-"でいる場合がこれにあたります。"
+"パッケージは手が入っていない素のソース tarball と共にアップロード<emphasis "
+"role=\"strong\">すべき</emphasis>ですが、それが可能ではない場合が色々とありま"
+"す。upstream がソースを gzip 圧縮した tarball を全く配布していない場合や、"
+"upstream の tarball が DFSG-free ではない、あなたがアップロード前に削除しなけ"
+"ればならない素材を含んでいる場合がこれにあたります。"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1756
+#: best-pkging-practices.dbk:1690
 msgid ""
 "In these cases the developer must construct a suitable <filename>.orig.tar."
 "{gz,bz2,xz}</filename> file himself.  We refer to such a tarball as a "
@@ -3484,9 +3384,9 @@ msgstr ""
 "バージョン番号は <replaceable>開発元のバージョン</replaceable> と "
 "<replaceable>debian リビジョン</replaceable> から構成されたままです。"
 
-#FIXME-trans: defend your desicion ... 以下。
+# FIXME-trans: defend your desicion ... 以下。
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1765
+#: best-pkging-practices.dbk:1699
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <filename>.tar.{gz,bz2,xz}</filename> that could in "
@@ -3496,22 +3396,22 @@ msgid ""
 "the upstream archive.  Use your own discretion here, but be prepared to "
 "defend your decision if you repackage source that could have been pristine."
 msgstr ""
-"開発元が、原則的にはそのままの形で使える <filename>.tar.{gz,bz2,xz}</filename> "
-"を配布していたとしても再パッケージをしたくなるという場合がありえます。最も明解なのは、"
-"tar アーカイブを再圧縮することや upstream のアーカイブから純粋に使われていないゴミ"
-"を削除することで、<emphasis>非常に</emphasis>容量を節約できる時です。"
-"ここで慎重になって頂きたいのですが、ソースを再パッケージする場合は、決定を貫く用意を"
-"してください。"
+"開発元が、原則的にはそのままの形で使える <filename>.tar.{gz,bz2,xz}</"
+"filename> を配布していたとしても再パッケージをしたくなるという場合がありえま"
+"す。最も明解なのは、tar アーカイブを再圧縮することや upstream のアーカイブか"
+"ら純粋に使われていないゴミを削除することで、<emphasis>非常に</emphasis>容量を"
+"節約できる時です。ここで慎重になって頂きたいのですが、ソースを再パッケージす"
+"る場合は、決定を貫く用意をしてください。"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1774
+#: best-pkging-practices.dbk:1708
 msgid "A repackaged <filename>.orig.tar.{gz,bz2,xz}</filename>"
 msgstr ""
 "<filename>.orig.tar.{gz,bz2,xz}</filename> についてのベストプラクティス"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1713
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be documented in the resulting "
 "source package.  Detailed information on how the repackaged source was "
@@ -3532,7 +3432,7 @@ msgstr ""
 "えです。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
-#: best-pkging-practices.dbk:1794
+#: best-pkging-practices.dbk:1728
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
@@ -3546,11 +3446,11 @@ msgstr ""
 "からのビルド失敗を引き起こす場合、適切な処置はファイルを編集するのではなく、"
 "non-free な部分を削除して、ソースツリーのルートに <filename>README.source</"
 "filename> ファイルとして状況を説明することです。ですがその場合、開発元の作者"
-"に non-free なコンポーネントを残りのソースから分離しやすくするように促して"
-"ください。"
+"に non-free なコンポーネントを残りのソースから分離しやすくするように促してく"
+"ださい。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1792
+#: best-pkging-practices.dbk:1726
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
@@ -3561,7 +3461,7 @@ msgstr ""
 "\"footnote\" id=\"0\"/>"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1805
+#: best-pkging-practices.dbk:1739
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
@@ -3581,19 +3481,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1814
+#: best-pkging-practices.dbk:1748
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
 "mirror rather than trying to locate a canonical upstream distribution point)."
 msgstr ""
-"(<emphasis>理由:</emphasis> Debian 以外のプラットフォームのためにソフト"
-"ウェアをビルドする必要がある Debian ユーザが、開発元の一次配布先を探そうとせ"
-"ずに Debian ミラーからソースを取得する、というのは普通です)。"
+"(<emphasis>理由:</emphasis> Debian 以外のプラットフォームのためにソフトウェア"
+"をビルドする必要がある Debian ユーザが、開発元の一次配布先を探そうとせずに "
+"Debian ミラーからソースを取得する、というのは普通です)。"
 
 # FIXME-trans: pristine の訳
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1821
+#: best-pkging-practices.dbk:1755
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<filename><replaceable>packagename</replaceable>-<replaceable>upstream-"
@@ -3603,11 +3503,11 @@ msgid ""
 msgstr ""
 "tarball の最上位ディレクトリの名前として <filename><replaceable>パッケージ名"
 "</replaceable>-<replaceable>開発元のバージョン</replaceable>.orig</filename> "
-"を<emphasis role=\"strong\">使うべき</emphasis>です。これは、大元の使用されていない tarball "
-"と再パッケージしたものを判別できるようにしてくれます。"
+"を<emphasis role=\"strong\">使うべき</emphasis>です。これは、大元の使用されて"
+"いない tarball と再パッケージしたものを判別できるようにしてくれます。"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1829
+#: best-pkging-practices.dbk:1763
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
@@ -3616,12 +3516,12 @@ msgstr ""
 "emphasis>です。"
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1770
 msgid "Changing binary files"
 msgstr "バイナリファイルの変更"
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1838
+#: best-pkging-practices.dbk:1772
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "
@@ -3645,13 +3545,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1853
+#: best-pkging-practices.dbk:1787
 msgid "Best practices for debug packages"
 msgstr "デバッグパッケージのベストプラクティス"
 
 # FIXME-trans: otherwise?
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1855
+#: best-pkging-practices.dbk:1789
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that <command>gdb</command> can use.  Since Debian "
@@ -3670,7 +3570,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1863
+#: best-pkging-practices.dbk:1797
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
@@ -3692,7 +3592,7 @@ msgstr ""
 "成候補です。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1873
+#: best-pkging-practices.dbk:1807
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
@@ -3706,17 +3606,17 @@ msgid ""
 "lib/libfoo.so.1</filename> go in <filename>/usr/lib/debug/usr/lib/libfoo."
 "so.1</filename>."
 msgstr ""
-"デバッグパッケージのうちいくつかは、ライブラリあるいは他のバイナリの完全に特別な"
-"デバッグビルドを含むでしょうが、それらの大半は容量やビルドする時間を節約できます。"
-"<filename>/usr/lib/debug/<replaceable>path</replaceable></filename> "
-"の場合、<replaceable>path</replaceable> は実行ファイルかライブラリへのパスになり"
-"ます。例えば、<filename>/usr/bin/foo</filename> のデバッグシンボルは "
-"<filename>/usr/lib/debug/usr/bin/foo</filename> に行き、<filename>/usr/lib/"
-"libfoo.so.1</filename> のデバッグシンボルは <filename>/usr/lib/debug/usr/lib/"
-"libfoo.so.1</filename> になります。"
+"デバッグパッケージのうちいくつかは、ライブラリあるいは他のバイナリの完全に特"
+"別なデバッグビルドを含むでしょうが、それらの大半は容量やビルドする時間を節約"
+"できます。<filename>/usr/lib/debug/<replaceable>path</replaceable></"
+"filename> の場合、<replaceable>path</replaceable> は実行ファイルかライブラリ"
+"へのパスになります。例えば、<filename>/usr/bin/foo</filename> のデバッグシン"
+"ボルは <filename>/usr/lib/debug/usr/bin/foo</filename> に行き、<filename>/"
+"usr/lib/libfoo.so.1</filename> のデバッグシンボルは <filename>/usr/lib/debug/"
+"usr/lib/libfoo.so.1</filename> になります。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1819
 msgid ""
 "The debugging symbols can be extracted from an object file using "
 "<command>objcopy --only-keep-debug</command>.  Then the object file can be "
@@ -3726,14 +3626,14 @@ msgid ""
 "citerefentry> explains in detail how this works."
 msgstr ""
 "デバッグシンボルは <command>objcopy --only-keep-debug</command> を使ってオブ"
-"ジェクトファイルから展開できます。そうすればオブジェクトファイルを strip するこ"
-"とができ、<command>objcopy --add-gnu-debuglink</command> がデバッグシンボル"
+"ジェクトファイルから展開できます。そうすればオブジェクトファイルを strip する"
+"ことができ、<command>objcopy --add-gnu-debuglink</command> がデバッグシンボル"
 "ファイルへのパスを指定するのに使われます。<citerefentry> "
 "<refentrytitle>objcopy</refentrytitle> <manvolnum>1</manvolnum> </"
 "citerefentry> で、これがどの様に動作するのかを詳細に説明しています。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1893
+#: best-pkging-practices.dbk:1827
 msgid ""
 "The <command>dh_strip</command> command in <systemitem role=\"package"
 "\">debhelper</systemitem> supports creating debug packages, and can take "
@@ -3744,15 +3644,15 @@ msgid ""
 "control</filename> for the debug package."
 msgstr ""
 "<systemitem role=\"package\">debhelper</systemitem> 中の <command>dh_strip</"
-"command> コマンドは、デバッグパッケージの作成をサポートし、デバッグシンボル"
-"を分離するのに <command>objcopy</command> の利用の面倒を見てくれます。あなたの"
+"command> コマンドは、デバッグパッケージの作成をサポートし、デバッグシンボルを"
+"分離するのに <command>objcopy</command> の利用の面倒を見てくれます。あなたの"
 "パッケージが <systemitem role=\"package\">debhelper</systemitem> を使っている"
 "場合、あなたがする必要があるのは <command>dh_strip --dbg-package=libfoo-dbg</"
 "command> を呼び出し、<filename>debian/control</filename> にデバッグパッケージ"
 "のエントリを追加することだけです。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1900
+#: best-pkging-practices.dbk:1834
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
@@ -3763,20 +3663,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1904
+#: best-pkging-practices.dbk:1838
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr "Depends: libfoo (= ${binary:Version})\n"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1908
+#: best-pkging-practices.dbk:1842
 msgid "Best practices for meta-packages"
 msgstr "メタパッケージのベストプラクティス"
 
-#FIXME-trans: evolve over time
+# FIXME-trans: evolve over time
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1910
+#: best-pkging-practices.dbk:1844
 msgid ""
 "A meta-package is a mostly empty package that makes it easy to install a "
 "coherent set of packages that can evolve over time. It achieves this by "
@@ -3790,19 +3690,20 @@ msgid ""
 "(built by the source packages <systemitem role=\"package\">meta-gnome2</"
 "systemitem> and <systemitem role=\"package\">linux-latest</systemitem>)."
 msgstr ""
-"メタパッケージは、時間がかかる一貫したセットのパッケージをインストールするのを楽にして"
-"くれる、ほぼ空のパッケージです。そのセットの全パッケージに依存することで、これを実現しています。"
-"APT の力のおかげで、メタパッケージのメンテナは依存関係を調整すればユーザのシステムが自動的"
-"に追加パッケージを得ることができます。自動的にインストールされていてメタパッケージから"
-"落とされたパッケージは、削除候補としてマークされます (そして <command>aptitude</command> "
-"によって自動的に削除もされます)。<systemitem role=\"package\">gnome</systemitem> "
-"と <systemitem role=\"package\">linux-image-amd64</systemitem> は、メタパッ"
-"ケージの 2 つの例です (ソースパッケージ <systemitem role=\"package\">meta-"
+"メタパッケージは、時間がかかる一貫したセットのパッケージをインストールするの"
+"を楽にしてくれる、ほぼ空のパッケージです。そのセットの全パッケージに依存する"
+"ことで、これを実現しています。APT の力のおかげで、メタパッケージのメンテナは"
+"依存関係を調整すればユーザのシステムが自動的に追加パッケージを得ることができ"
+"ます。自動的にインストールされていてメタパッケージから落とされたパッケージ"
+"は、削除候補としてマークされます (そして <command>aptitude</command> によって"
+"自動的に削除もされます)。<systemitem role=\"package\">gnome</systemitem> と "
+"<systemitem role=\"package\">linux-image-amd64</systemitem> は、メタパッケー"
+"ジの 2 つの例です (ソースパッケージ <systemitem role=\"package\">meta-"
 "gnome2</systemitem> and <systemitem role=\"package\">linux-latest</"
 "systemitem> から生成されています)。"
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1924
+#: best-pkging-practices.dbk:1858
 msgid ""
 "The long description of the meta-package must clearly document its purpose "
 "so that the user knows what he will lose if he removes the package. Being "
@@ -3819,3 +3720,155 @@ msgstr ""
 "けではないメタパッケージにとって、特に重要です。システムのアップグレードをス"
 "ムースに保証するのに重要になり、潜在的な破損をさけるためにユーザに対してアン"
 "インストールする気をなくさせることでしょう。"
+
+#~ msgid ""
+#~ "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. "
+#~ "The first method does <emphasis>preventive</emphasis> search and replace "
+#~ "actions in the PO files. The latter uses <command>gettext</command> "
+#~ "utilities to <emphasis>unfuzzy</emphasis> strings."
+#~ msgstr ""
+#~ "翻訳から <emphasis>fuzzy を取り除く</emphasis>場合、2 つの方法を選ぶことが"
+#~ "できます。1 つ目のやり方は<emphasis>preventive</emphasis> 検索を行い、PO "
+#~ "ファイル中で置換作業を行います。もう一つのやり方は、<emphasis>fuzzy 文字列"
+#~ "を取り除く</emphasis>のに <command>gettext</command> ユーティリティを使い"
+#~ "ます。"
+
+#~ msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
+#~ msgstr "<emphasis>fuzzy の予防</emphasis> 方法:"
+
+#~ msgid ""
+#~ "Try finding a complete translation file <emphasis role=\"strong\">before</"
+#~ "emphasis> the change:"
+#~ msgstr ""
+#~ "変更<emphasis role=\"strong\">前</emphasis>に完全な翻訳ファイルを見つける"
+#~ "ようにしてください:"
+
+#~ msgid "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+#~ msgstr "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics $i; done"
+
+# FIXME-trans: 訳を再度見直す
+#~ msgid ""
+#~ "The file only showing <emphasis>translated</emphasis> items will be used "
+#~ "as the reference file. If there is none (which should not happen if you "
+#~ "take care to properly interact with translators), you should use the file "
+#~ "with the most translated strings."
+#~ msgstr ""
+#~ "<emphasis>翻訳済み</emphasis>の項目のみを表示しているファイルは、参照ファ"
+#~ "イルとして扱われるようになります。何もなければ (もし、あなたが翻訳作業者と"
+#~ "対応するのに適切に気を配っていたならば起こるはずがありません)、ほぼ翻訳さ"
+#~ "れている文字列を含んだファイルを使います。"
+
+#~ msgid ""
+#~ "Identify the needed change. In this example, let's assume the change is "
+#~ "about fixing a typo in the word <literal>typo</literal> which was "
+#~ "inadvertently written as <literal>tpyo</literal>. Therefore, the change "
+#~ "is <command>s/tpyo/typo</command>."
+#~ msgstr ""
+#~ "必要な変更を認識します。この例では、文字列 <literal>typo</literal> が不注"
+#~ "意にも <literal>tpyo</literal> として書かれている誤字の修正の変更であると"
+#~ "仮定してみましょう。そのため、変更は <command>s/tpyo/typo</command> です。"
+
+#~ msgid ""
+#~ "Check that this change is only applied to the place where you really "
+#~ "intend to make it and <emphasis role=\"strong\">not</emphasis> in any "
+#~ "other place where the original string is appropriate. This specifically "
+#~ "applies to change in punctuation, for instance."
+#~ msgstr ""
+#~ "この変更が本当に意図した場所だけに適用されて、元々の文字列が適切な他の場所"
+#~ "には<emphasis role=\"strong\">適用されない</emphasis> ことを確認しましょ"
+#~ "う。例えば、これは特に句読点の変更に当てはまります。"
+
+#~ msgid ""
+#~ "Modify all PO files by using <command>sed</command>. The use of that "
+#~ "command is recommended over any text editor to guarantee that the files "
+#~ "encoding will not be broken by the edit action:"
+#~ msgstr ""
+#~ "すべての PO ファイルを <command>sed</command> を使って変更してください。編"
+#~ "集作業によってファイルのエンコーディングがこわされないことを保証するため、"
+#~ "どのテキストエディタよりもこのコマンドの利用を推奨します。"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#~ msgid ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+#~ msgstr ""
+#~ "cd debian/po\n"
+#~ "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+
+#~ msgid "Run <command>debconf-updatepo</command>."
+#~ msgstr "<command>debconf-updatepo</command> を実行する。"
+
+#~ msgid ""
+#~ "Check the <filename>foo.po</filename> reference file. Its statistics "
+#~ "should not be changed:"
+#~ msgstr ""
+#~ "<filename>foo.po</filename> 参照ファイルをチェックする。統計は変化がないは"
+#~ "ずです:"
+
+#~ msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+#~ msgstr "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+
+#~ msgid ""
+#~ "If the file's statistics changed, you did something wrong. Try again or "
+#~ "ask for help on the &email-debian-i18n; mailing list."
+#~ msgstr ""
+#~ "ファイルの統計が変化していた場合、何かしら間違ったことをやっています。再度"
+#~ "やってみるか、&email-debian-i18n; メーリングリストで助けを求めましょう。"
+
+#~ msgid "Gettext utilities method:"
+#~ msgstr "gettext ユーティリティを使う方法:"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#~ msgid ""
+#~ "Put all incomplete PO files out of the way.  You can check the "
+#~ "completeness by using (needs the <systemitem role=\"package\">gettext</"
+#~ "systemitem> package installed):"
+#~ msgstr ""
+#~ "不完全な PO ファイルすべてをどけておきましょう。以下の様にすれば達成度を"
+#~ "チェックできます (<systemitem role=\"package\">gettext</systemitem> パッ"
+#~ "ケージがインストールされている必要があります):"
+
+#~ msgid ""
+#~ "Move all files which report either fuzzy strings to a temporary place.  "
+#~ "Files which report no fuzzy strings (only translated and untranslated) "
+#~ "will be kept in place."
+#~ msgstr ""
+#~ "fuzzy 文字列を報告してきたすべてのファイルを一時的な場所へ移動しましょう。"
+#~ "何も fuzzy 文字列を報告しないファイル (翻訳済と未訳のみ) はそこに置いたま"
+#~ "まにしておきます。"
+
+#~ msgid ""
+#~ "Now <emphasis role=\"strong\">and now only</emphasis>, modify the "
+#~ "template for the typos and check again that translation are not impacted "
+#~ "(typos, spelling errors, sometimes typographical corrections are usually "
+#~ "OK)."
+#~ msgstr ""
+#~ "今、<emphasis role=\"strong\">そうたった今</emphasis>、誤字の修正のために"
+#~ "テンプレートに手を入れて翻訳が影響を受けていないことを再確認しましょう (誤"
+#~ "字、スペルミス、時には文言の修正なども大抵は OK です)。"
+
+# FIXME-trans: You can see this by running the above again. の訳
+#~ msgid ""
+#~ "Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
+#~ "modified in translations.  You can see this by running the above again."
+#~ msgstr ""
+#~ "<command>debconf-updatepo</command> を実行します。これは、翻訳中であなたが"
+#~ "変更したすべての文字列を fuzzy にします。上記を再度実行すれば、これを見る"
+#~ "ことができます。"
+
+#~ msgid "Use the following command:"
+#~ msgstr "以下のコマンドを利用してください:"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#~ msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+#~ msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+
+#~ msgid ""
+#~ "Move back to <filename>debian/po</filename> the files which showed fuzzy "
+#~ "strings in the first step."
+#~ msgstr ""
+#~ "最初の手順で fuzzy 文字列を表示していた <filename>debian/po</filename> の"
+#~ "ファイルに戻ってください。"
+
+#~ msgid "Run <command>debconf-updatepo</command> again."
+#~ msgstr "再度 <command>debconf-updatepo</command> を実行してください。"
diff --git a/po4a/po/best-pkging-practices.pot b/po4a/po/best-pkging-practices.pot
index 1518b97..ae6319a 100644
--- a/po4a/po/best-pkging-practices.pot
+++ b/po4a/po/best-pkging-practices.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
@@ -1216,171 +1216,104 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:833
 msgid ""
-"To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
-"first method does <emphasis>preventive</emphasis> search and replace actions "
-"in the PO files. The latter uses <command>gettext</command> utilities to "
-"<emphasis>unfuzzy</emphasis> strings."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:839
-msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
+"To <emphasis>unfuzzy</emphasis> translations, you can use "
+"<command>msguntypot</command> (part of the <systemitem "
+"role=\"package\">po4a</systemitem> package)."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:844
-msgid ""
-"Try finding a complete translation file <emphasis "
-"role=\"strong\">before</emphasis> the change:"
+#: best-pkging-practices.dbk:840
+msgid "Regenerate the POT and PO files."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:918
+#: best-pkging-practices.dbk:842 best-pkging-practices.dbk:865
 #, no-wrap
-msgid ""
-"for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics "
-"$i; done"
+msgid "debconf-updatepo"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:849
-msgid ""
-"The file only showing <emphasis>translated</emphasis> items will be used as "
-"the reference file. If there is none (which should not happen if you take "
-"care to properly interact with translators), you should use the file with "
-"the most translated strings."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:857
-msgid ""
-"Identify the needed change. In this example, let's assume the change is "
-"about fixing a typo in the word <literal>typo</literal> which was "
-"inadvertently written as <literal>tpyo</literal>. Therefore, the change is "
-"<command>s/tpyo/typo</command>."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:865
-msgid ""
-"Check that this change is only applied to the place where you really intend "
-"to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
-"where the original string is appropriate. This specifically applies to "
-"change in punctuation, for instance."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:873
-msgid ""
-"Modify all PO files by using <command>sed</command>. The use of that command "
-"is recommended over any text editor to guarantee that the files encoding "
-"will not be broken by the edit action:"
+#: best-pkging-practices.dbk:846
+msgid "Make a copy of the POT file."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:878
+#: best-pkging-practices.dbk:848
 #, no-wrap
-msgid ""
-"cd debian/po\n"
-"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+msgid "cp templates.pot templates.pot.orig"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:884
-msgid "Change the debconf template file to fix the typo."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:889
-msgid "Run <command>debconf-updatepo</command>."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:894
-msgid ""
-"Check the <filename>foo.po</filename> reference file. Its statistics should "
-"not be changed:"
+#: best-pkging-practices.dbk:852
+msgid "Make a copy of all the PO files."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:898
+#: best-pkging-practices.dbk:854
 #, no-wrap
-msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+msgid "mkdir po_fridge; cp *.po po_fridge"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:903
-msgid ""
-"If the file's statistics changed, you did something wrong. Try again or ask "
-"for help on the &email-debian-i18n; mailing list."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:909
-msgid "Gettext utilities method:"
+#: best-pkging-practices.dbk:858
+msgid "Change the debconf template files to fix the typos."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:914
-msgid ""
-"Put all incomplete PO files out of the way.  You can check the completeness "
-"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
-"package installed):"
+#: best-pkging-practices.dbk:863
+msgid "Regenerate the POT and PO files (again)."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:922
+#: best-pkging-practices.dbk:867
 msgid ""
-"Move all files which report either fuzzy strings to a temporary place.  "
-"Files which report no fuzzy strings (only translated and untranslated) will "
-"be kept in place."
+"At this point, the typo fix fuzzied all the translations, and this "
+"unfortunate change is the only one between the PO files of your main "
+"directory and the one from the fridge. Here is how to solve this."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:929
-msgid ""
-"Now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
-"for the typos and check again that translation are not impacted (typos, "
-"spelling errors, sometimes typographical corrections are usually OK)."
+#: best-pkging-practices.dbk:874
+msgid "Discard fuzzy translation, restore the ones from the fridge."
 msgstr ""
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:936
-msgid ""
-"Run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
-"modified in translations.  You can see this by running the above again."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:876
+#, no-wrap
+msgid "cp po_fridge/*.po ."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:942
-msgid "Use the following command:"
+#: best-pkging-practices.dbk:880
+msgid ""
+"Manually merge the PO files with the new POT file, but taking the useless "
+"fuzzy into account."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:944
+#: best-pkging-practices.dbk:882
 #, no-wrap
-msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
+msgid "msguntypot -o templates.pot.orig -n templates.pot *.po"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:948
-msgid ""
-"Move back to <filename>debian/po</filename> the files which showed fuzzy "
-"strings in the first step."
+#: best-pkging-practices.dbk:886
+msgid "Clean up."
 msgstr ""
 
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:953
-msgid "Run <command>debconf-updatepo</command> again."
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:888
+#, no-wrap
+msgid "rm -rf templates.pot.orig po_fridge"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:960
+#: best-pkging-practices.dbk:894
 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:962
+#: best-pkging-practices.dbk:896
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer "
@@ -1389,7 +1322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:901
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
@@ -1398,19 +1331,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:907
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:979
+#: best-pkging-practices.dbk:913
 msgid "Do not use first person"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:981
+#: best-pkging-practices.dbk:915
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do "
 "this...</emphasis> or <emphasis>We recommend...</emphasis>).  The computer "
@@ -1423,24 +1356,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:991
+#: best-pkging-practices.dbk:925
 msgid "Be gender neutral"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:993
+#: best-pkging-practices.dbk:927
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1001
+#: best-pkging-practices.dbk:935
 msgid "Templates fields definition"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1003
+#: best-pkging-practices.dbk:937
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> "
@@ -1448,27 +1381,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1008
+#: best-pkging-practices.dbk:942
 msgid "Type"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1010
+#: best-pkging-practices.dbk:944
 msgid "string"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1012
+#: best-pkging-practices.dbk:946
 msgid "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1017
+#: best-pkging-practices.dbk:951
 msgid "password"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1019
+#: best-pkging-practices.dbk:953
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
@@ -1476,24 +1409,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1026
+#: best-pkging-practices.dbk:960
 msgid "boolean"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:962
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1034
+#: best-pkging-practices.dbk:968
 msgid "select"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1036
+#: best-pkging-practices.dbk:970
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
@@ -1501,7 +1434,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1041
+#: best-pkging-practices.dbk:975
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
@@ -1509,7 +1442,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1046
+#: best-pkging-practices.dbk:980
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
@@ -1517,7 +1450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
-#: best-pkging-practices.dbk:1051
+#: best-pkging-practices.dbk:985
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
@@ -1529,7 +1462,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1059
+#: best-pkging-practices.dbk:993
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
@@ -1537,7 +1470,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1064
+#: best-pkging-practices.dbk:998
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> "
@@ -1546,24 +1479,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1072
+#: best-pkging-practices.dbk:1006
 msgid "multiselect"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1008
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1080
+#: best-pkging-practices.dbk:1014
 msgid "note"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1082
+#: best-pkging-practices.dbk:1016
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
@@ -1573,22 +1506,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1091
+#: best-pkging-practices.dbk:1025
 msgid "text"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1093
+#: best-pkging-practices.dbk:1027
 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1098
+#: best-pkging-practices.dbk:1032
 msgid "error"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1100
+#: best-pkging-practices.dbk:1034
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
@@ -1596,26 +1529,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:1105
+#: best-pkging-practices.dbk:1039
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1047
 msgid "Description: short and extended description"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1115
+#: best-pkging-practices.dbk:1049
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1053
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accommodated by most debconf interfaces.  Keeping it short also helps "
@@ -1624,7 +1557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1059
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
@@ -1633,14 +1566,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1131
+#: best-pkging-practices.dbk:1065
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1135
+#: best-pkging-practices.dbk:1069
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
@@ -1650,7 +1583,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1142
+#: best-pkging-practices.dbk:1076
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
@@ -1658,7 +1591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1081
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
@@ -1667,26 +1600,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1153
+#: best-pkging-practices.dbk:1087
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1091
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1163
+#: best-pkging-practices.dbk:1097
 msgid "Choices"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1165
+#: best-pkging-practices.dbk:1099
 msgid ""
 "This field should be used for select and multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
@@ -1694,12 +1627,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1172
+#: best-pkging-practices.dbk:1106
 msgid "Default"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1174
+#: best-pkging-practices.dbk:1108
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
@@ -1707,41 +1640,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1183
+#: best-pkging-practices.dbk:1117
 msgid "Templates fields specific style guide"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1185
+#: best-pkging-practices.dbk:1119
 msgid "Type field"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1121
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1127
 msgid "Description field"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1195
+#: best-pkging-practices.dbk:1129
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1199
+#: best-pkging-practices.dbk:1133
 msgid "String/password templates"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1203
+#: best-pkging-practices.dbk:1137
 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Avoid question style prompts (IP "
@@ -1750,7 +1683,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1210
+#: best-pkging-practices.dbk:1144
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
@@ -1759,12 +1692,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1220
+#: best-pkging-practices.dbk:1154
 msgid "Boolean templates"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1224
+#: best-pkging-practices.dbk:1158
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
@@ -1773,19 +1706,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1232
+#: best-pkging-practices.dbk:1166
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1240
+#: best-pkging-practices.dbk:1174
 msgid "Select/Multiselect"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1244
+#: best-pkging-practices.dbk:1178
 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Do <emphasis "
@@ -1794,7 +1727,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1252
+#: best-pkging-practices.dbk:1186
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
@@ -1803,26 +1736,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1262
+#: best-pkging-practices.dbk:1196
 msgid "Notes"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1266
+#: best-pkging-practices.dbk:1200
 msgid ""
 "The short description should be considered to be a <emphasis "
 "role=\"strong\">title</emphasis>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1205
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1277
+#: best-pkging-practices.dbk:1211
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
@@ -1835,12 +1768,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1292
+#: best-pkging-practices.dbk:1226
 msgid "Choices field"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1294
+#: best-pkging-practices.dbk:1228
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
@@ -1848,12 +1781,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1235 best-pkging-practices.dbk:1273
 msgid "Default field"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1303
+#: best-pkging-practices.dbk:1237
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
@@ -1861,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1242
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
@@ -1870,12 +1803,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1314
+#: best-pkging-practices.dbk:1248
 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:1317
+#: best-pkging-practices.dbk:1251
 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
@@ -1894,7 +1827,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1328
+#: best-pkging-practices.dbk:1262
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
@@ -1902,21 +1835,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1267
 msgid ""
 "The comments are needed as the _Default trick is a bit confusing: the "
 "translators may put their own choice"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1341
+#: best-pkging-practices.dbk:1275
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1345
+#: best-pkging-practices.dbk:1279
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see <xref linkend=\"s6.5.2.2\"/>), consider making this field translatable, "
@@ -1924,7 +1857,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1350
+#: best-pkging-practices.dbk:1284
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
@@ -1934,12 +1867,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1362
+#: best-pkging-practices.dbk:1296
 msgid "Internationalization"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:1364
+#: best-pkging-practices.dbk:1298
 msgid ""
 "This section contains global information for developers to make translators' "
 "life easier.  More information for translators and developers interested in "
@@ -1949,12 +1882,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1371
+#: best-pkging-practices.dbk:1305
 msgid "Handling debconf translations"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1373
+#: best-pkging-practices.dbk:1307
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
@@ -1963,7 +1896,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1379
+#: best-pkging-practices.dbk:1313
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
@@ -1977,7 +1910,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1389
+#: best-pkging-practices.dbk:1323
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>.po</filename> files (drawing from "
@@ -1994,12 +1927,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1405
+#: best-pkging-practices.dbk:1339
 msgid "Internationalized documentation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1407
+#: best-pkging-practices.dbk:1341
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
@@ -2007,7 +1940,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1412
+#: best-pkging-practices.dbk:1346
 msgid ""
 "If you maintain documentation of any size, it is easier for translators if "
 "they have access to a source control system.  That lets translators see the "
@@ -2024,7 +1957,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1426
+#: best-pkging-practices.dbk:1360
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
@@ -2033,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1432
+#: best-pkging-practices.dbk:1366
 msgid ""
 "Some tools (e.g. <systemitem role=\"package\">po4a</systemitem>, <systemitem "
 "role=\"package\">poxml</systemitem>, or the <systemitem "
@@ -2044,17 +1977,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1444
+#: best-pkging-practices.dbk:1378
 msgid "Common packaging situations"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1455
+#: best-pkging-practices.dbk:1389
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1457
+#: best-pkging-practices.dbk:1391
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
@@ -2067,12 +2000,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1469
+#: best-pkging-practices.dbk:1403
 msgid "Libraries"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1471
+#: best-pkging-practices.dbk:1405
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
@@ -2081,26 +2014,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1477
+#: best-pkging-practices.dbk:1411
 msgid ""
 "Good practices for library packaging have been grouped in <ulink "
 "url=\"&url-libpkg-guide;\">the library packaging guide</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1484
+#: best-pkging-practices.dbk:1418
 msgid "Documentation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1486
+#: best-pkging-practices.dbk:1420
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1491
+#: best-pkging-practices.dbk:1425
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
@@ -2108,7 +2041,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1496
+#: best-pkging-practices.dbk:1430
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
@@ -2118,7 +2051,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1503
+#: best-pkging-practices.dbk:1437
 msgid ""
 "Major shipped manuals should register themselves with <systemitem "
 "role=\"package\">doc-base</systemitem> on installation.  See the <systemitem "
@@ -2127,7 +2060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1509
+#: best-pkging-practices.dbk:1443
 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "
@@ -2137,7 +2070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1516
+#: best-pkging-practices.dbk:1450
 msgid ""
 "The manpages do not need to be written directly in the troff format.  "
 "Popular source formats are Docbook, POD and reST, which can be converted "
@@ -2147,19 +2080,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1525
+#: best-pkging-practices.dbk:1459
 msgid "Specific types of packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1527
+#: best-pkging-practices.dbk:1461
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1533
+#: best-pkging-practices.dbk:1467
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl "
 "policy</ulink>, some examples of packages following that policy are "
@@ -2169,28 +2102,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1476
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1549
+#: best-pkging-practices.dbk:1483
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1556
+#: best-pkging-practices.dbk:1490
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1563
+#: best-pkging-practices.dbk:1497
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
@@ -2199,7 +2132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1571
+#: best-pkging-practices.dbk:1505
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> "
@@ -2207,7 +2140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1577
+#: best-pkging-practices.dbk:1511
 msgid ""
 "Lisp packages should register themselves with <systemitem "
 "role=\"package\">common-lisp-controller</systemitem>, about which see "
@@ -2215,12 +2148,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1607
+#: best-pkging-practices.dbk:1541
 msgid "Architecture-independent data"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1609
+#: best-pkging-practices.dbk:1543
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
@@ -2230,7 +2163,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1616
+#: best-pkging-practices.dbk:1550
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package "
@@ -2244,19 +2177,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1628
+#: best-pkging-practices.dbk:1562
 msgid "Needing a certain locale during build"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1630
+#: best-pkging-practices.dbk:1564
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1634
+#: best-pkging-practices.dbk:1568
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of "
 "<filename>/usr/lib/locale</filename>, and <varname>LC_ALL</varname> to the "
@@ -2265,7 +2198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1639
+#: best-pkging-practices.dbk:1573
 #, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
@@ -2281,12 +2214,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1652
+#: best-pkging-practices.dbk:1586
 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1654
+#: best-pkging-practices.dbk:1588
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
@@ -2296,7 +2229,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1661
+#: best-pkging-practices.dbk:1595
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, "
 "<command>deborphan</command> tries to search all transitional packages which "
@@ -2305,7 +2238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1668
+#: best-pkging-practices.dbk:1602
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
@@ -2314,7 +2247,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1674
+#: best-pkging-practices.dbk:1608
 msgid ""
 "Also, it is recommended to adjust its section to <literal>oldlibs</literal> "
 "and its priority to <literal>extra</literal> in order to ease "
@@ -2322,24 +2255,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1683
+#: best-pkging-practices.dbk:1617
 msgid "Best practices for <filename>.orig.tar.{gz,bz2,xz}</filename> files"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1619
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1689
+#: best-pkging-practices.dbk:1623
 msgid "Pristine source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1693
+#: best-pkging-practices.dbk:1627
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
@@ -2355,7 +2288,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1691
+#: best-pkging-practices.dbk:1625
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "
 "<filename>.orig.tar.{gz,bz2,xz}</filename> file is byte-for-byte identical "
@@ -2368,7 +2301,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1711
+#: best-pkging-practices.dbk:1645
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but "
@@ -2378,12 +2311,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1719
+#: best-pkging-practices.dbk:1653
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: best-pkging-practices.dbk:1722
+#: best-pkging-practices.dbk:1656
 #, no-wrap
 msgid ""
 "zcat "
@@ -2392,7 +2325,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1727
+#: best-pkging-practices.dbk:1661
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
@@ -2402,7 +2335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1736
+#: best-pkging-practices.dbk:1670
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common "
 "top-level directory (shame on the upstream author!).  In this case, "
@@ -2412,12 +2345,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1747
+#: best-pkging-practices.dbk:1681
 msgid "Repackaged upstream source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1749
+#: best-pkging-practices.dbk:1683
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
@@ -2427,7 +2360,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1756
+#: best-pkging-practices.dbk:1690
 msgid ""
 "In these cases the developer must construct a suitable "
 "<filename>.orig.tar.{gz,bz2,xz}</filename> file himself.  We refer to such a "
@@ -2441,7 +2374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1765
+#: best-pkging-practices.dbk:1699
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <filename>.tar.{gz,bz2,xz}</filename> that could in "
@@ -2453,12 +2386,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1774
+#: best-pkging-practices.dbk:1708
 msgid "A repackaged <filename>.orig.tar.{gz,bz2,xz}</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1713
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be documented in the resulting "
 "source package.  Detailed information on how the repackaged source was "
@@ -2472,7 +2405,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
-#: best-pkging-practices.dbk:1794
+#: best-pkging-practices.dbk:1728
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
@@ -2484,7 +2417,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1792
+#: best-pkging-practices.dbk:1726
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
@@ -2492,7 +2425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1805
+#: best-pkging-practices.dbk:1739
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
@@ -2504,7 +2437,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1814
+#: best-pkging-practices.dbk:1748
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
@@ -2513,7 +2446,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1821
+#: best-pkging-practices.dbk:1755
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<filename><replaceable>packagename</replaceable>-<replaceable>upstream-version</replaceable>.orig</filename> "
@@ -2522,19 +2455,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1829
+#: best-pkging-practices.dbk:1763
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1770
 msgid "Changing binary files"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1838
+#: best-pkging-practices.dbk:1772
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "
@@ -2548,12 +2481,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1853
+#: best-pkging-practices.dbk:1787
 msgid "Best practices for debug packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1855
+#: best-pkging-practices.dbk:1789
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that <command>gdb</command> can use.  Since Debian "
@@ -2565,7 +2498,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1863
+#: best-pkging-practices.dbk:1797
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
@@ -2578,7 +2511,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1873
+#: best-pkging-practices.dbk:1807
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
@@ -2594,7 +2527,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1819
 msgid ""
 "The debugging symbols can be extracted from an object file using "
 "<command>objcopy --only-keep-debug</command>.  Then the object file can be "
@@ -2605,7 +2538,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1893
+#: best-pkging-practices.dbk:1827
 msgid ""
 "The <command>dh_strip</command> command in <systemitem "
 "role=\"package\">debhelper</systemitem> supports creating debug packages, "
@@ -2617,7 +2550,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1900
+#: best-pkging-practices.dbk:1834
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For "
@@ -2625,18 +2558,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1904
+#: best-pkging-practices.dbk:1838
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1908
+#: best-pkging-practices.dbk:1842
 msgid "Best practices for meta-packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1910
+#: best-pkging-practices.dbk:1844
 msgid ""
 "A meta-package is a mostly empty package that makes it easy to install a "
 "coherent set of packages that can evolve over time. It achieves this by "
@@ -2653,7 +2586,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1924
+#: best-pkging-practices.dbk:1858
 msgid ""
 "The long description of the meta-package must clearly document its purpose "
 "so that the user knows what he will lose if he removes the package. Being "
diff --git a/po4a/po/beyond-pkging.pot b/po4a/po/beyond-pkging.pot
index 7cdac89..e4ce0ca 100644
--- a/po4a/po/beyond-pkging.pot
+++ b/po4a/po/beyond-pkging.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/developer-duties.pot b/po4a/po/developer-duties.pot
index 5395290..290800c 100644
--- a/po4a/po/developer-duties.pot
+++ b/po4a/po/developer-duties.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/index.pot b/po4a/po/index.pot
index 61bd078..62ac508 100644
--- a/po4a/po/index.pot
+++ b/po4a/po/index.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/l10n.pot b/po4a/po/l10n.pot
index b3117a7..d9fc3cb 100644
--- a/po4a/po/l10n.pot
+++ b/po4a/po/l10n.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/new-maintainer.pot b/po4a/po/new-maintainer.pot
index c93b901..1287a46 100644
--- a/po4a/po/new-maintainer.pot
+++ b/po4a/po/new-maintainer.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/pkgs.pot b/po4a/po/pkgs.pot
index 435b382..5e23557 100644
--- a/po4a/po/pkgs.pot
+++ b/po4a/po/pkgs.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/resources.pot b/po4a/po/resources.pot
index 7eb7303..b6d2dc0 100644
--- a/po4a/po/resources.pot
+++ b/po4a/po/resources.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/scope.pot b/po4a/po/scope.pot
index 428380d..af1e747 100644
--- a/po4a/po/scope.pot
+++ b/po4a/po/scope.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"
diff --git a/po4a/po/tools.pot b/po4a/po/tools.pot
index 83ac359..f2ada3b 100644
--- a/po4a/po/tools.pot
+++ b/po4a/po/tools.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-12 09:49+0300\n"
+"POT-Creation-Date: 2012-01-10 17:56-0400\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"