r1853: * Fix dangling markup in dh_installinit pod. Closes: #348073

* Updated French translation from Valéry Perrin. Closes: #348074

4 files changed, 187 insertions, 118 deletions

diff --git a/debian/changelog b/debian/changelog
index d885d696..54a2e49a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.16) unstable; urgency=low
+
+  * Fix dangling markup in dh_installinit pod. Closes: #348073
+  * Updated French translation from Valéry Perrin. Closes: #348074
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2006 17:29:27 -0500
+
 debhelper (5.0.15) unstable; urgency=low
 
   * Fix ghastly option parsing error in last release that broke
diff --git a/dh_installinit b/dh_installinit
index 36e9d716..952e2d35 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -88,8 +88,6 @@ preference to the files it normally installs.
 
 This parameter is deprecated, use the --name parameter instead.
 
-=item B<
-
 =item B<--error-handler=>I<function>
 
 Call the named shell function if running the init script fails. The
diff --git a/man/po4a/add.fr b/man/po4a/add.fr
index 65f06a15..5f70b50d 100644
--- a/man/po4a/add.fr
+++ b/man/po4a/add.fr
@@ -2,7 +2,7 @@ PO4A-HEADER:mode=after;position=AUTEUR;beginboundary=\=head1
 
 =head1 TRADUCTION
 
-Valéry Perrin <valery.perrin.debian@free.fr> le 17 septembre 2005. Dernière mise à jour le 20 decembre 2005.
+Valéry Perrin <valery.perrin.debian@free.fr> le 17 septembre 2005. Dernière mise à jour le 14 janvier 2006.
 
 L'équipe de traduction a fait le maximum pour réaliser une adaptation française de qualité.
 
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index bbab838e..74b18e6b 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -1,10 +1,10 @@
 # Translation of debhelper manpages to French
-# Valery Perrin <valery.perrin.debian@free.fr>, 2005.
+# Valery Perrin <valery.perrin.debian@free.fr>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2005-12-09 18:08-0500\n"
-"PO-Revision-Date: 2005-12-20 10:23+0100\n"
+"POT-Creation-Date: 2006-01-14 14:11+0100\n"
+"PO-Revision-Date: 2006-01-14 15:37+0100\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -94,18 +94,19 @@ msgstr ""
 # type: =head1
 #: dh_installpam:24 dh_installemacsen:34 dh_installinfo:36 dh_strip:35
 #: dh_installppp:26 dh_compress:38 dh_md5sums:28 dh_installexamples:29
-#: dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_installmodules:35
-#: dh_installmenu:33 dh_installlogrotate:22 dh_clean:25 dh_testversion:34
-#: dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31 dh_installdirs:32
-#: dh_link:48 dh_installdebconf:59 dh_installmime:30 dh_installwm:30
-#: dh_builddeb:21 dh_gencontrol:26 dh_install:43 dh_makeshlibs:24 dh_perl:28
-#: dh_fixperms:31 dh_installman:54 dh_movefiles:32 dh_installchangelogs:40
-#: dh_python:35 dh_installdocs:51 dh_installcatalogs:42 dh_installmanpages:40
+#: dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34
+#: dh_installmodules:35 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25
+#: dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31
+#: dh_installdirs:32 dh_link:48 dh_installdebconf:59 dh_installmime:30
+#: dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43
+#: dh_makeshlibs:24 dh_perl:28 dh_fixperms:31 dh_installman:54 dh_movefiles:32
+#: dh_installchangelogs:40 dh_python:35 dh_installdocs:51
+#: dh_installcatalogs:42 dh_installmanpages:40
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 # type: =item
-#: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:65
+#: dh_installpam:28 dh_installppp:30 dh_installcron:28 dh_installinit:72
 #: dh_installmodules:43 dh_installlogrotate:26
 msgid "B<--name=>I<name>"
 msgstr "B<--name=>I<nom>"
@@ -124,15 +125,15 @@ msgstr ""
 # type: =head1
 #: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:221
 #: dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102
-#: dh_installcron:61 dh_installinit:188 dh_usrlocal:113 dh_gconf:58
+#: dh_installcron:61 dh_installinit:199 dh_usrlocal:113 dh_gconf:90
 #: dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50
-#: debhelper.pod:433 dh_clean:106 dh_undocumented:28 dh_testversion:74
+#: debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74
 #: dh_testdir:43 dh_shlibdeps:148 dh_scrollkeeper:75 dh_installdirs:87
-#: dh_link:206 dh_installdebconf:135 dh_installmime:84 dh_installwm:94
+#: dh_link:212 dh_installdebconf:135 dh_installmime:84 dh_installwm:94
 #: dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251
 #: dh_makeshlibs:183 dh_perl:140 dh_fixperms:107 dh_listpackages:28
 #: dh_installman:210 dh_testroot:26 dh_movefiles:162 dh_desktop:43
-#: dh_suidregister:117 dh_installchangelogs:125 dh_python:266
+#: dh_suidregister:117 dh_installchangelogs:125 dh_python:274
 #: dh_installdocs:233 dh_installcatalogs:105 dh_installmanpages:197
 #: dh_installxfonts:83 dh_installlogcheck:51
 msgid "SEE ALSO"
@@ -141,14 +142,14 @@ msgstr "VOIR AUSSI"
 # type: textblock
 #: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:223
 #: dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104
-#: dh_installcron:63 dh_installinit:190 dh_usrlocal:115 dh_gconf:60
+#: dh_installcron:63 dh_installinit:201 dh_usrlocal:115 dh_gconf:92
 #: dh_installmodules:104 dh_installlogrotate:52 dh_clean:108
 #: dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89
-#: dh_link:208 dh_installdebconf:137 dh_installmime:86 dh_installwm:96
+#: dh_link:214 dh_installdebconf:137 dh_installmime:86 dh_installwm:96
 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253
 #: dh_makeshlibs:185 dh_perl:142 dh_fixperms:109 dh_listpackages:30
 #: dh_installman:212 dh_testroot:28 dh_movefiles:164 dh_suidregister:119
-#: dh_installchangelogs:127 dh_python:268 dh_installdocs:235
+#: dh_installchangelogs:127 dh_python:276 dh_installdocs:235
 #: dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85
 #: dh_installlogcheck:53
 msgid "L<debhelper(7)>"
@@ -157,30 +158,30 @@ msgstr "L<debhelper(7)>"
 # type: textblock
 #: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:225
 #: dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106
-#: dh_installcron:65 dh_installinit:192 dh_usrlocal:117 dh_gconf:62
+#: dh_installcron:65 dh_installinit:203 dh_usrlocal:117 dh_gconf:94
 #: dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110
 #: dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:152
-#: dh_scrollkeeper:79 dh_installdirs:91 dh_link:210 dh_installdebconf:139
+#: dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:139
 #: dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82
 #: dh_gencontrol:77 dh_install:255 dh_makeshlibs:187 dh_perl:144
 #: dh_fixperms:111 dh_listpackages:32 dh_installman:214 dh_testroot:30
 #: dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129
-#: dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
+#: dh_python:278 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
 
 # type: =head1
 #: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:227
 #: dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108
-#: dh_installcron:67 dh_installinit:194 dh_usrlocal:119 dh_gconf:64
+#: dh_installcron:67 dh_installinit:205 dh_usrlocal:119 dh_gconf:96
 #: dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56
-#: debhelper.pod:447 dh_clean:112 dh_undocumented:34 dh_testversion:80
+#: debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80
 #: dh_testdir:49 dh_shlibdeps:154 dh_scrollkeeper:81 dh_installdirs:93
-#: dh_link:212 dh_installdebconf:141 dh_installmime:90 dh_installwm:100
+#: dh_link:218 dh_installdebconf:141 dh_installmime:90 dh_installwm:100
 #: dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257
 #: dh_makeshlibs:189 dh_perl:146 dh_fixperms:113 dh_listpackages:34
 #: dh_installman:216 dh_testroot:32 dh_movefiles:168 dh_desktop:49
-#: dh_suidregister:123 dh_installchangelogs:131 dh_python:272
+#: dh_suidregister:123 dh_installchangelogs:131 dh_python:280
 #: dh_installdocs:239 dh_installcatalogs:111 dh_installmanpages:203
 #: dh_installxfonts:89 dh_installlogcheck:57
 msgid "AUTHOR"
@@ -189,10 +190,10 @@ msgstr "AUTEUR"
 # type: textblock
 #: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:229
 #: dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110
-#: dh_installcron:69 dh_installinit:196 dh_installmodules:110
-#: dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:449 dh_clean:114
+#: dh_installcron:69 dh_installinit:207 dh_installmodules:110
+#: dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114
 #: dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:156
-#: dh_installdirs:95 dh_link:214 dh_installdebconf:143 dh_installmime:92
+#: dh_installdirs:95 dh_link:220 dh_installdebconf:143 dh_installmime:92
 #: dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81
 #: dh_install:259 dh_makeshlibs:191 dh_fixperms:115 dh_listpackages:36
 #: dh_installman:218 dh_testroot:34 dh_movefiles:170 dh_suidregister:125
@@ -260,7 +261,7 @@ msgstr ""
 #: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42
 #: dh_installmodules:39 dh_installmenu:37 dh_scrollkeeper:35
 #: dh_installdebconf:63 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58
-#: dh_python:56 dh_installdocs:60 dh_installcatalogs:46
+#: dh_python:53 dh_installdocs:60 dh_installcatalogs:46
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -298,14 +299,14 @@ msgstr ""
 
 # type: =head1
 #: dh_installemacsen:53 dh_installinfo:56 dh_strip:74 dh_installexamples:50
-#: dh_installinit:92 dh_usrlocal:48 dh_installmodules:52 debhelper.pod:158
+#: dh_installinit:101 dh_usrlocal:48 dh_installmodules:52 debhelper.pod:158
 #: dh_scrollkeeper:41 dh_installmime:40 dh_installwm:49 dh_installman:70
 #: dh_movefiles:58 dh_installdocs:87 dh_installcatalogs:52 dh_installxfonts:36
 msgid "NOTES"
 msgstr "REMARQUES"
 
 # type: textblock
-#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:94 dh_usrlocal:50
+#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:103 dh_usrlocal:50
 #: dh_installmodules:54 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51
 #: dh_installcatalogs:54
 msgid ""
@@ -580,7 +581,7 @@ msgstr ""
 "rien ne sera dépouillé, conformément à la Charte Debian."
 
 # type: =head1
-#: dh_strip:79 dh_compress:61 dh_usrlocal:54 dh_perl:58 dh_python:62
+#: dh_strip:79 dh_compress:61 dh_usrlocal:54 dh_perl:58 dh_python:59
 msgid "CONFORMS TO"
 msgstr "CONFORMITÉ"
 
@@ -871,7 +872,7 @@ msgid "B<-Xitem>, B<--exclude=item>"
 msgstr "B<-Xélément>, B<--exclude=élément>"
 
 # type: textblock
-#: dh_installexamples:45 dh_install:49 dh_movefiles:46 dh_installdocs:66
+#: dh_installexamples:45 dh_install:49 dh_movefiles:46
 msgid ""
 "Exclude files that contain \"item\" anywhere in their filename from being "
 "installed."
@@ -993,22 +994,40 @@ msgstr ""
 
 # type: =item
 #: dh_installinit:41
+msgid "B<-o>, B<--onlyscripts>"
+msgstr "B<-o>, B<--onlyscripts>"
+
+# type: textblock
+#: dh_installinit:43
+msgid ""
+"Only modify postinst/postrm/prerm scripts, do not actually install any init "
+"script or default files. May be useful if the init script is shipped and/or "
+"installed by upstream in a way that doesn't make it easy to let "
+"dh_installinit find it."
+msgstr ""
+"Modifie seulement les scripts de postinst, postrm et prerm. N'installe "
+"actuellement ni script d'initialisation, ni fichier par défaut. Ceci peut "
+"être utile si le script d'initialisation est inclus et/ou installé en amont "
+"d'une façon qui ne rend pas facile sa recherche par dh_installinit."
+
+# type: =item
+#: dh_installinit:48
 msgid "B<-r>, B<--no-restart-on-upgrade>"
 msgstr "B<-r>, B<--no-restart-on-upgrade>"
 
 # type: textblock
-#: dh_installinit:43
+#: dh_installinit:50
 msgid "Do not restart init script on upgrade."
 msgstr ""
 "Empêche le redémarrage du script d'initialisation lors d'une mise à jour."
 
 # type: =item
-#: dh_installinit:45
+#: dh_installinit:52
 msgid "B<--no-start>"
 msgstr "B<--no-start>"
 
 # type: textblock
-#: dh_installinit:47
+#: dh_installinit:54
 msgid ""
 "Do not start the init script on install or upgrade, or stop it on removal.  "
 "Only call update-rc.d. Useful for rcS scripts."
@@ -1018,12 +1037,12 @@ msgstr ""
 "un update-rc.d. Utile pour les scripts rcS."
 
 # type: =item
-#: dh_installinit:50
+#: dh_installinit:57
 msgid "B<-d>, B<--remove-d>"
 msgstr "B<-d>, B<--remove-d>"
 
 # type: textblock
-#: dh_installinit:52
+#: dh_installinit:59
 msgid ""
 "Remove trailing \"d\" from the name of the package, and use the result for "
 "the filename the init script is installed as in etc/init.d/ , and the "
@@ -1038,18 +1057,18 @@ msgstr ""
 "paramètre a priorité sur --init-script décrit ci-dessous."
 
 # type: =item
-#: dh_installinit:58
+#: dh_installinit:65
 msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
 msgstr "B<-u>I<paramètres> B<--update-rcd-params=>I<paramètres>"
 
 # type: =item
-#: dh_installinit:60 dh_shlibdeps:32 dh_installdebconf:67 dh_builddeb:37
+#: dh_installinit:67 dh_shlibdeps:32 dh_installdebconf:67 dh_builddeb:37
 #: dh_gencontrol:32
 msgid "B<--> I<params>"
 msgstr "B<--> I<paramètres>"
 
 # type: textblock
-#: dh_installinit:62
+#: dh_installinit:69
 msgid ""
 "Pass \"params\" to L<update-rc.d(8)>. If not specified, \"defaults\" will be "
 "passed to L<update-rc.d(8)>."
@@ -1058,7 +1077,7 @@ msgstr ""
 "S<« defaults »> sera passé à L<update-rc.d(8)>."
 
 # type: textblock
-#: dh_installinit:67
+#: dh_installinit:74
 msgid ""
 "Install the init script (and default file) using the filename I<name> "
 "instead of the default filename, which is the package name. When this "
@@ -1073,12 +1092,12 @@ msgstr ""
 "et debian/paquet.default habituels."
 
 # type: =item
-#: dh_installinit:73
+#: dh_installinit:80
 msgid "B<--init-script=>I<scriptname>"
 msgstr "B<--init-script=>I<nom-du-script>"
 
 # type: textblock
-#: dh_installinit:75
+#: dh_installinit:82
 msgid ""
 "Use \"scriptname\" as the filename the init script is installed as in etc/"
 "init.d/ (and also use it as the filename for the defaults file, if it is "
@@ -1095,17 +1114,22 @@ msgstr ""
 "habituellement."
 
 # type: textblock
-#: dh_installinit:82
+#: dh_installinit:89
 msgid "This parameter is deprecated, use the --name parameter instead."
 msgstr "Ce paramètre est déconseillé. Il vaut mieux utiliser --name."
 
 # type: =item
-#: dh_installinit:84
+#: dh_installinit:91
+msgid "B<"
+msgstr " "
+
+# type: =item
+#: dh_installinit:93
 msgid "B<--error-handler=>I<function>"
 msgstr "B<--error-handler=>I<fonction>"
 
 # type: textblock
-#: dh_installinit:86
+#: dh_installinit:95
 msgid ""
 "Call the named shell function if running the init script fails. The function "
 "should be provided in the prerm and postinst scripts, before the #DEBHELPER# "
@@ -1215,30 +1239,60 @@ msgstr ""
 #: dh_gconf:21
 msgid ""
 "It automatically generates the postinst and prerm fragments needed to "
-"register and unregister the schemas in usr/share/gconf/schemas.  These "
-"fragments will use gconftool-2, so the package should depend on gconf2. This "
-"program will add an appropriate dependency to ${misc:Depends}."
+"register and unregister the schemas in usr/share/gconf/schemas, using gconf-"
+"schemas."
 msgstr ""
 "Il produit automatiquement les lignes de code dans les scripts de "
 "maintenance postinst et prerm nécessaires à l'inscription et à la radiation "
-"des schémas dans usr/share/gconf/schemas. Comme ces lignes de code utilisent "
-"gconftool-2, le paquet construit devra dépendre de gconf2. dh_gconf ajoutera "
-"cette dépendance indispensable à ${misc:Depends}."
+"des schémas dans usr/share/gconf/schemas. Cette fonction utilise gconf-"
+"schemas."
 
 # type: textblock
-#: dh_gconf:26
+#: dh_gconf:25
 msgid ""
-"The postinst script will also signal gconfd-2 so that the newly installed "
-"schemas are available straight away."
+"If a file named debian/package.gconf-defaults exists, then it is installed "
+"into usr/share/gconf/defaults/10_package in the package build directory, "
+"with \"package\" replaced by the package name. Some postinst and postrm "
+"fragments will be generated to launch update-gconf-defaults."
 msgstr ""
-"Le script de maintenance postinst enverra également un signal à gconfd-2 "
-"afin que les schémas nouvellement ajoutés soient pris en compte "
-"immédiatement."
+"S'il existe un fichier nommé debian/paquet.gconf-defaults, il sera installé "
+"dans le répertoire de construction du paquet sous usr/share/gconf/"
+"defaults/10_paquet où le mot S<« paquet »> sera remplacé par le nom du "
+"paquet. Certaines parties des scripts de maintenance postinst et postrm "
+"seront produites pour exécuter update-gconf-defaults."
 
 # type: textblock
-#: dh_gconf:66 dh_scrollkeeper:83 dh_desktop:51
-msgid "Ross Burton <ross@burtonini.com>"
-msgstr "Ross Burton <ross@burtonini.com>"
+#: dh_gconf:30
+msgid ""
+"The gconf-schemas and update-gconf-defaults scripts are provided by the "
+"gconf2 package. An appropriate dependency will be generated in ${misc:"
+"Depends}."
+msgstr ""
+"Les scripts gconf-schemas et update-gconf-defaults sont fournis par le "
+"paquet gconf2. La dépendance correspondante sera ajoutée dans ${misc:"
+"Depends}."
+
+# type: =item
+#: dh_gconf:38
+msgid "B<--priority> I<priority>"
+msgstr "B<--priority> I<priorité>"
+
+# type: textblock
+#: dh_gconf:40
+msgid ""
+"Use I<priority> (which should be a 2-digit number) as the defaults priority "
+"instead of 10. Higher values than ten can be used by derived distributions "
+"(20), CDD distributions (50), or site-specific packages (90)."
+msgstr ""
+"Détermine la I<priorité> (sous forme d'un nombre à deux chiffres) en "
+"remplacement de la priorité par défaut 10. Des valeurs plus élevées peuvent "
+"être utilisées pour les distribution dérivées (20), les distributions CDD "
+"(50), ou les paquets spécifiques à un site (90)."
+
+# type: textblock
+#: dh_gconf:98
+msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
+msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 
 # type: textblock
 #: dh_installmodules:5
@@ -1295,7 +1349,7 @@ msgstr ""
 
 # type: textblock
 #: dh_installmodules:41 dh_installmenu:39 dh_installmime:36 dh_makeshlibs:60
-#: dh_python:58
+#: dh_python:55
 msgid "Do not modify postinst/postrm scripts."
 msgstr "Empêche la modification des scripts de maintenance postinst et postrm."
 
@@ -2107,7 +2161,7 @@ msgstr "Ce mode fonctionne comme V2 mais avec les ajouts S<suivants :>"
 # type: =item
 #: debhelper.pod:285 debhelper.pod:290 debhelper.pod:294 debhelper.pod:308
 #: debhelper.pod:313 debhelper.pod:318 debhelper.pod:323 debhelper.pod:336
-#: debhelper.pod:340 debhelper.pod:345
+#: debhelper.pod:340 debhelper.pod:345 debhelper.pod:349
 msgid "-"
 msgstr "-"
 
@@ -2216,13 +2270,20 @@ msgstr ""
 msgid "dh_installdocs skips installing empty files."
 msgstr "dh_installdocs saute l'installation des fichiers vides."
 
+# type: textblock
+#: debhelper.pod:351
+msgid "dh_install errors out if wildcards expand to nothing."
+msgstr ""
+"dh_install génère des erreurs si les jokers (wildcards) ne correspondent à "
+"rien."
+
 # type: =head2
-#: debhelper.pod:353
+#: debhelper.pod:357
 msgid "Doc directory symlinks"
 msgstr "Liens symboliques vers le répertoire de documentation"
 
 # type: textblock
-#: debhelper.pod:355
+#: debhelper.pod:359
 msgid ""
 "Sometimes it is useful to make a package not contain a /usr/share/doc/"
 "package directory at all, instead placing just a dangling symlink in the "
@@ -2245,12 +2306,12 @@ msgstr ""
 "en l'air »> et ne pas essayer d'installer un fichier copyright ou changelog."
 
 # type: =head2
-#: debhelper.pod:364
+#: debhelper.pod:368
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
-#: debhelper.pod:366
+#: debhelper.pod:370
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"XC-Package-Type: udeb\" to the package's stanza in debian/control, and "
@@ -2269,12 +2330,12 @@ msgstr ""
 "les scripts de configuration, etc."
 
 # type: =head2
-#: debhelper.pod:373
+#: debhelper.pod:377
 msgid "Other notes"
 msgstr "Autres remarques"
 
 # type: textblock
-#: debhelper.pod:375
+#: debhelper.pod:379
 msgid ""
 "In general, if any debhelper program needs a directory to exist under "
 "debian/, it will create it. I haven't bothered to document this in all the "
@@ -2291,7 +2352,7 @@ msgstr ""
 "fichiers menu, etc."
 
 # type: textblock
-#: debhelper.pod:381
+#: debhelper.pod:385
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
 "Build-Depends line in debian/control. You should build-depend on a version "
@@ -2306,7 +2367,7 @@ msgstr ""
 "le paquet emploie le niveau 5 de S<compatibilité :>"
 
 # type: verbatim
-#: debhelper.pod:387
+#: debhelper.pod:391
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 5)\n"
@@ -2316,17 +2377,17 @@ msgstr ""
 "\n"
 
 # type: =head1
-#: debhelper.pod:389
+#: debhelper.pod:393
 msgid "ENVIRONMENT"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: =item
-#: debhelper.pod:393
+#: debhelper.pod:397
 msgid "DH_VERBOSE"
 msgstr "DH_VERBOSE"
 
 # type: textblock
-#: debhelper.pod:395
+#: debhelper.pod:399
 msgid ""
 "Set to 1 to enable verbose mode. Debhelper will output every command it runs "
 "that modifies files on the build system."
@@ -2335,12 +2396,12 @@ msgstr ""
 "commande exécutée qui modifie des fichiers."
 
 # type: =item
-#: debhelper.pod:398
+#: debhelper.pod:402
 msgid "DH_COMPAT"
 msgstr "DH_COMPAT"
 
 # type: textblock
-#: debhelper.pod:400
+#: debhelper.pod:404
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in debian/compat."
@@ -2349,22 +2410,22 @@ msgstr ""
 "fonctionner. Cette valeur supplante la valeur précisée dans debian/compat."
 
 # type: =item
-#: debhelper.pod:403
+#: debhelper.pod:407
 msgid "DH_NO_ACT"
 msgstr "DH_NO_ACT"
 
 # type: textblock
-#: debhelper.pod:405
+#: debhelper.pod:409
 msgid "Set to 1 to enable no-act mode."
 msgstr "Mettre cette variable à 1 pour activer le mode simulation (no-act)."
 
 # type: =item
-#: debhelper.pod:407
+#: debhelper.pod:411
 msgid "DH_OPTIONS"
 msgstr "DH_OPTIONS"
 
 # type: textblock
-#: debhelper.pod:409
+#: debhelper.pod:413
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. This is useful in some situations, for example, if "
@@ -2381,12 +2442,12 @@ msgstr ""
 "méthode."
 
 # type: =item
-#: debhelper.pod:415
+#: debhelper.pod:419
 msgid "DH_ALWAYS_EXCLUDE"
 msgstr "DH_ALWAYS_EXCLUDE"
 
 # type: textblock
-#: debhelper.pod:417
+#: debhelper.pod:421
 msgid ""
 "If set, this adds the value the variable is set to to the -X options of all "
 "commands that support the -X option. Moreover, dh_builddeb will rm -rf "
@@ -2398,7 +2459,7 @@ msgstr ""
 "construction de paquet."
 
 # type: textblock
-#: debhelper.pod:421
+#: debhelper.pod:425
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting DH_ALWAYS_EXCLUDE=CVS will prevent any CVS directories from "
@@ -2416,7 +2477,7 @@ msgstr ""
 "soit l'endroit où le paquet est construit."
 
 # type: textblock
-#: debhelper.pod:428
+#: debhelper.pod:432
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "DH_ALWAYS_EXCLUDE=CVS:.svn"
@@ -2425,23 +2486,23 @@ msgstr ""
 "dans DH_ALWAYS_EXCLUDE=CVS:.svn"
 
 # type: =item
-#: debhelper.pod:437
+#: debhelper.pod:441
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
-#: debhelper.pod:439
+#: debhelper.pod:443
 msgid "A set of example debian/rules files that use debhelper."
 msgstr ""
 "Un ensemble d'exemples de fichiers debian/rules qui utilisent debhelper."
 
 # type: =item
-#: debhelper.pod:441
+#: debhelper.pod:445
 msgid "L<http://kitenet.net/programs/debhelper/>"
 msgstr "L<http://kitenet.net/programs/debhelper/>"
 
 # type: textblock
-#: debhelper.pod:443
+#: debhelper.pod:447
 msgid "Debhelper web site."
 msgstr "Le site internet de debhelper."
 
@@ -2892,6 +2953,11 @@ msgid "L<debhelper>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
+#: dh_scrollkeeper:83 dh_desktop:51
+msgid "Ross Burton <ross@burtonini.com>"
+msgstr "Ross Burton <ross@burtonini.com>"
+
+# type: textblock
 #: dh_installdirs:5
 msgid "dh_installdirs - create subdirectories in package build directories"
 msgstr ""
@@ -4782,60 +4848,49 @@ msgstr "I<module répertoires>"
 msgid ""
 "If your package installs python modules in non-standard directories, you can "
 "make dh_python check those directories by passing their names on the command "
-"line. By default, it will check /usr/lib/site-python, /usr/lib/$PACKAGE, /"
-"usr/share/$PACKAGE, /usr/lib/games/$PACKAGE, /usr/share/games/$PACKAGE and /"
-"usr/lib/python?.?/site-packages."
+"line. By default, it will check /usr/lib/$PACKAGE, /usr/share/$PACKAGE, /usr/"
+"lib/games/$PACKAGE, /usr/share/games/$PACKAGE and /usr/lib/python?.?/site-"
+"packages."
 msgstr ""
 "Si le paquet installe les modules Python dans un répertoire non standard, il "
 "est possible de forcer dh_python à vérifier ces répertoires en passant leur "
 "nom en argument de la ligne de commande. Par défaut il vérifiera /usr/lib/"
-"site-python, /usr/lib/$PACKAGE, /usr/share/$PACKAGE, /usr/lib/games/"
-"$PACKAGE, /usr/share/games/$PACKAGE et /usr/lib/python?.?/site-packages."
-
-# type: textblock
-#: dh_python:47
-msgid ""
-"Note: only /usr/lib/site-python, /usr/lib/python?.?/site-packages and the "
-"extra names on the command line are searched for binary (.so) modules."
-msgstr ""
-"S<Nota :> seuls /usr/lib/site-python, /usr/lib/python?.?/site-packages et "
-"les répertoires indiqués sur la ligne de commande seront examinés à la "
-"recherche de modules binaires (.so)."
+"$PACKAGE, /usr/share/$PACKAGE, /usr/lib/games/$PACKAGE, /usr/share/games/"
+"$PACKAGE et /usr/lib/python?.?/site-packages."
 
 # type: =item
-#: dh_python:50
+#: dh_python:47
 msgid "B<-V> I<version>"
 msgstr "B<-V> I<version>"
 
 # type: textblock
-#: dh_python:52
+#: dh_python:49
 msgid ""
 "If the .py files your package ships are meant to be used by a specific "
 "pythonX.Y version, you can use this option to specify the desired version, "
-"such as 2.3. Do not use if you ship modules in /usr/lib/site-python."
+"such as 2.3."
 msgstr ""
-"Si le fichier .py indique que le paquet est censé exploiter une version "
-"spécifique pythonX.Y, il est possible d'employer cette option pour indiquer "
-"la version désirée, comme 2.3. Il ne faut pas utiliser cette option si les "
-"modules sont dans /usr/lib/site-python."
+"Si le fichier .py indique que le paquet est censé être exploité par une "
+"version spécifique pythonX.Y, il est possible d'employer cette option pour "
+"indiquer la version désirée, comme 2.3."
 
 # type: textblock
-#: dh_python:64
+#: dh_python:61
 msgid "Debian policy, version 3.5.7"
 msgstr "Charte Debian, version 3.5.7"
 
 # type: textblock
-#: dh_python:66
+#: dh_python:63
 msgid "Python policy, version 0.3.7"
 msgstr "Charte Python, version 0.3.7"
 
 # type: textblock
-#: dh_python:274
+#: dh_python:282
 msgid "Josselin Mouette <joss@debian.org>"
 msgstr "Josselin Mouette <joss@debian.org>"
 
 # type: textblock
-#: dh_python:276
+#: dh_python:284
 msgid "most ideas stolen from Brendan O'Dea <bod@debian.org>"
 msgstr "La plupart des idées ont été volées à Brendan O'Dea <bod@debian.org>"
 
@@ -4948,6 +5003,15 @@ msgstr ""
 "possible d'utiliser des fichiers nommés debian/paquet.doc-base.*"
 
 # type: textblock
+#: dh_installdocs:66
+msgid ""
+"Exclude files that contain \"item\" anywhere in their filename from being "
+"installed. Note that this includes doc-base files."
+msgstr ""
+"Exclut les fichiers qui comportent S<« élément »>, n'importe où dans leur "
+"nom, de l'installation. Il est à noter que cela inclut les fichiers doc-base."
+
+# type: textblock
 #: dh_installdocs:71
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "