Revert revision 502. It was not a typo.

And fix the French translation accordingly.

man/C/dpkg-divert.8

@@ -93,7 +93,7 @@ same SONAME as the undiverted one.
 .SH EXAMPLES
 To divert all copies of a \fI/usr/bin/example\fR to \fI/usr/bin/example.foo\fR,
 i.e. directs all packages providing \fI/usr/bin/example\fR to install it as
-\fI/usr/bin/example.foo\fR, performing the rename is required:
+\fI/usr/bin/example.foo\fR, performing the rename if required:
 .HP
 dpkg-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP

man/ChangeLog

@@ -1,9 +1,3 @@
-2006-08-17  Nicolas Francois  <nicolas.francois@centraliens.net>
-
-	* C/dpkg-divert.8: Typo fix.
-	* po4a/dpkg-divert.8/po/dpkg-divert.8.pot: Regenerated.
-	* po4a/dpkg-divert.8/po/*.po: Merge with pot file.
-
 2006-08-17  Philippe Batailler  <philippe.batailler@free.fr>
 	
 	* po4a/dpkg-statoverride.8/po/fr.po: updated translation.
@@ -14,7 +8,7 @@
 	* po4a/dpkg-divert.8/po/fr.po: likewise.
 	* po4a/deb-control.5/po/fr.po: likewise.
 	* po4a/dpkg.1/po/fr.po: likewise.
-
+	
 2006-08-07  KISE Hiroshi  <kise@fuyuneko.jp>
 
 	* po4a/add_ja/dpkg-name.1.ja.add: Recode the addendum in UTF-8.

man/po4a/dpkg-divert.8/po/de.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-08-17 11:52+0200\n"
+"POT-Creation-Date: 2006-08-02 21:53+0200\n"
 "PO-Revision-Date: 2006-08-01 18:28+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -296,11 +296,10 @@ msgstr "BEISPIELE"
 
 # type: Plain text
 #: ../../../man/po4a/../C/dpkg-divert.8:97
-#, fuzzy
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
 "e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename is required:"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 "Um alle Kopien von I</usr/bin/example> auf I</usr/bin/example.foo> "
 "umzuleiten, d.h. alle Pakete, die I</usr/bin/example> zur Verfügung stellen, "

man/po4a/dpkg-divert.8/po/dpkg-divert.8.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-08-17 11:52+0200\n"
+"POT-Creation-Date: 2006-08-02 21:53+0200\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"
@@ -261,7 +261,7 @@ msgstr ""
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, "
 "i.e. directs all packages providing I</usr/bin/example> to install it as "
-"I</usr/bin/example.foo>, performing the rename is required:"
+"I</usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text

man/po4a/dpkg-divert.8/po/es.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-08-17 11:52+0200\n"
+"POT-Creation-Date: 2006-08-02 21:53+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -310,7 +310,7 @@ msgstr ""
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
 "e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename is required:"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text

man/po4a/dpkg-divert.8/po/fr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-08-17 11:52+0200\n"
+"POT-Creation-Date: 2006-08-02 21:53+0200\n"
 "PO-Revision-Date: 2006-08-17 10:38+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -298,12 +298,12 @@ msgstr "EXEMPLES"
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
 "e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename is required:"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 "Pour détourner toutes les copies de I</usr/bin/example> vers I</usr/bin/"
 "example.foo>, c'est-à-dire demander aux paquets qui fournissent I</usr/bin/"
-"example> de l'installer dans I</usr/bin/example.foo>, il faut modifier le nom"
-"\\ :"
+"example> de l'installer dans I</usr/bin/example.foo>, en effectuant le "
+"changement de nom si nécessaire\\ :"
 
 # type: Plain text
 #: ../../../man/po4a/../C/dpkg-divert.8:99

man/po4a/dpkg-divert.8/po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-08-17 11:52+0200\n"
+"POT-Creation-Date: 2006-08-02 21:53+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Japanese <debian-l10n-japanese@lists.debian.org>\n"
@@ -308,7 +308,7 @@ msgstr "EXAMPLES"
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
 "e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename is required:"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text