Revert revision 502. It was not a typo.

And fix the French translation accordingly.

diff --git a/man/C/dpkg-divert.8 b/man/C/dpkg-divert.8
index 0a6a3c391e9caa2ab8ef3b043a41bb3a8db2fe18..5a92985cefd268d32ab8273592b3bfa0a6bd7543 100644 (file)
--- a/man/C/dpkg-divert.8
+++ b/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

diff --git a/man/ChangeLog b/man/ChangeLog
index 2e1cb54ea741b16c4a768f199e31ecb0d72bda67..19aeee28a5d873d2d2e5741409a8bf0bfe58af17 100644 (file)
--- a/man/ChangeLog
+++ b/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.

diff --git a/man/po4a/dpkg-divert.8/po/de.po b/man/po4a/dpkg-divert.8/po/de.po
index 36bec6a700921608335af83cea5c7fc49cff9a57..cf14bb70c1b115de8abc61adbeb96b02784fe04b 100644 (file)
--- a/man/po4a/dpkg-divert.8/po/de.po
+++ b/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, "

diff --git a/man/po4a/dpkg-divert.8/po/dpkg-divert.8.pot b/man/po4a/dpkg-divert.8/po/dpkg-divert.8.pot
index 4c37408b558b2b0736a297bf63eddd8ae5d55dea..f4298a3911082cd9436366152b6d174eb586e698 100644 (file)
--- a/man/po4a/dpkg-divert.8/po/dpkg-divert.8.pot
+++ b/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

diff --git a/man/po4a/dpkg-divert.8/po/es.po b/man/po4a/dpkg-divert.8/po/es.po
index 8dd3a6da92ab03c664d33d8d0e7dac03737ab4e0..0e3b346ad4f96759435e25f25d05408637168a3a 100644 (file)
--- a/man/po4a/dpkg-divert.8/po/es.po
+++ b/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

diff --git a/man/po4a/dpkg-divert.8/po/fr.po b/man/po4a/dpkg-divert.8/po/fr.po
index a19b65b1d1b389617baec6cdb789680c15a9cce4..1071d3bdaea9ee0f797d8237832721949ff18264 100644 (file)
--- a/man/po4a/dpkg-divert.8/po/fr.po
+++ b/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

diff --git a/man/po4a/dpkg-divert.8/po/ja.po b/man/po4a/dpkg-divert.8/po/ja.po
index 111e5564d81826ec809c24d01c8c4feb93819fcc..a838d081531ef1dc9a6e543d79e2718134ea0712 100644 (file)
--- a/man/po4a/dpkg-divert.8/po/ja.po
+++ b/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