releasing version 7.4.187.4.18

4 files changed, 131 insertions, 102 deletions

diff --git a/debian/changelog b/debian/changelog
index 58a2bec5..970d7644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-debhelper (7.4.18) UNRELEASED; urgency=low
+debhelper (7.4.18) unstable; urgency=low
 
   * dh_gconf: Depend on new gconf2 that uses triggers, and stop
     calling triggered programs manually. Closes: #577179
 
- -- Joey Hess <joeyh@debian.org>  Sat, 10 Apr 2010 13:19:24 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Apr 2010 16:23:38 -0400
 
 debhelper (7.4.17) unstable; urgency=low
 
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index a80af998..daa03137 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-08 18:23-0300\n"
+"POT-Creation-Date: 2010-04-26 16:23-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1050,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:582 dh:726 dh_auto_build:47 dh_auto_clean:48 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 dh_builddeb:91 dh_clean:138 dh_compress:202 dh_desktop:31 dh_fixperms:122 dh_gconf:110 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 dh_installwm:108 dh_installxfonts:87 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:90 dh_movefiles:170 dh_perl:145 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:582 dh:726 dh_auto_build:47 dh_auto_clean:48 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 dh_builddeb:91 dh_clean:138 dh_compress:202 dh_desktop:31 dh_fixperms:122 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77 dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 dh_installlogcheck:66 dh_installlogrotate:50 dh_installman:253 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 dh_installwm:108 dh_installxfonts:87 dh_link:226 dh_lintian:57 dh_listpackages:29 dh_makeshlibs:237 dh_md5sums:90 dh_movefiles:170 dh_perl:145 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:227 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
@@ -1075,7 +1075,7 @@ msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:596 dh:732 dh_auto_build:53 dh_auto_clean:54 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 dh_builddeb:97 dh_clean:144 dh_compress:208 dh_desktop:37 dh_fixperms:128 dh_gconf:116 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83 dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 dh_md5sums:96 dh_movefiles:176 dh_perl:151 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:233 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:596 dh:732 dh_auto_build:53 dh_auto_clean:54 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 dh_builddeb:97 dh_clean:144 dh_compress:208 dh_desktop:37 dh_fixperms:128 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83 dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:72 dh_installlogrotate:56 dh_installman:259 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:65 dh_listpackages:35 dh_makeshlibs:243 dh_md5sums:96 dh_movefiles:176 dh_perl:151 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:233 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
@@ -1126,7 +1126,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:45 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:38 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
+#: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:38 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -1542,12 +1542,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:728 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 dh_compress:204 dh_fixperms:124 dh_gconf:112 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:171 dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 dh_md5sums:92 dh_movefiles:172 dh_perl:147 dh_prep:62 dh_python:282 dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
+#: dh:728 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140 dh_compress:204 dh_fixperms:124 dh_gconf:101 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:171 dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 dh_installlogcheck:68 dh_installlogrotate:52 dh_installman:255 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:31 dh_makeshlibs:239 dh_md5sums:92 dh_movefiles:172 dh_perl:147 dh_prep:62 dh_python:282 dh_strip:229 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:730 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:95 dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:114 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:173 dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 dh_md5sums:94 dh_movefiles:174 dh_perl:149 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:231 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
+#: dh:730 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:95 dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:173 dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 dh_installlogrotate:54 dh_installman:257 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_lintian:61 dh_listpackages:33 dh_makeshlibs:241 dh_md5sums:94 dh_movefiles:174 dh_perl:149 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:231 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -1823,7 +1823,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:27 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 dh_installmenu:25 dh_installmime:25 dh_installmodules:29 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:39 dh_lintian:21 dh_makeshlibs:24 dh_movefiles:26
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:50 dh_installmenu:25 dh_installmime:25 dh_installmodules:29 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:39 dh_lintian:21 dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr ""
 
@@ -2205,7 +2205,7 @@ msgstr ""
 
 #. type: textblock
 #: dh_gconf:5
-msgid "dh_gconf - generate GConf schema registration scripts"
+msgid "dh_gconf - install GConf defaults files and register schemas"
 msgstr ""
 
 #. type: textblock
@@ -2216,56 +2216,46 @@ msgstr ""
 #. type: textblock
 #: dh_gconf:18
 msgid ""
-"dh_gconf is a debhelper program that is responsible for registering GConf "
-"schemas."
+"dh_gconf is a debhelper program that is responsible for installing GConf "
+"defaults files and registering GConf schemas."
 msgstr ""
 
 #. type: textblock
 #: dh_gconf:21
-msgid ""
-"It automatically generates the postinst and prerm fragments needed to "
-"register and unregister the schemas in usr/share/gconf/schemas, using "
-"gconf-schemas."
-msgstr ""
-
-#. type: textblock
-#: dh_gconf:25
 msgid "An appropriate dependency on gconf2 will be generated in ${misc:Depends}."
 msgstr ""
 
 #. type: =item
-#: dh_gconf:31
+#: dh_gconf:27
 msgid "debian/I<package>.gconf-defaults"
 msgstr ""
 
 #. type: textblock
-#: dh_gconf:33
+#: dh_gconf:29
 msgid ""
 "Installed into usr/share/gconf/defaults/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name. Some postinst "
-"and postrm fragments will be generated to run update-gconf-defaults."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 
 #. type: =item
-#: dh_gconf:37
+#: dh_gconf:32
 msgid "debian/I<package>.gconf-mandatory"
 msgstr ""
 
 #. type: textblock
-#: dh_gconf:39
+#: dh_gconf:34
 msgid ""
 "Installed into usr/share/gconf/mandatory/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name, and similar "
-"postinst and postrm fragments will be generated."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 
 #. type: =item
-#: dh_gconf:49
+#: dh_gconf:43
 msgid "B<--priority> I<priority>"
 msgstr ""
 
 #. type: textblock
-#: dh_gconf:51
+#: dh_gconf:45
 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 "
@@ -2273,7 +2263,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_gconf:118
+#: dh_gconf:107
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr ""
 
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 14c7b4cc..6fd26e15 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-08 18:23-0300\n"
+"POT-Creation-Date: 2010-04-26 16:23-0300\n"
 "PO-Revision-Date: 2005-09-18 00:11+0200\n"
 "Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
 "Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -1481,7 +1481,7 @@ msgstr ""
 #: debhelper.pod:582 dh:726 dh_auto_build:47 dh_auto_clean:48
 #: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122
 #: dh_builddeb:91 dh_clean:138 dh_compress:202 dh_desktop:31 dh_fixperms:122
-#: dh_gconf:110 dh_gencontrol:82 dh_icons:65 dh_install:279
+#: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279
 #: dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77
 #: dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86
 #: dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106
@@ -1526,7 +1526,7 @@ msgstr "Web de Debhelper."
 #: debhelper.pod:596 dh:732 dh_auto_build:53 dh_auto_clean:54
 #: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130
 #: dh_builddeb:97 dh_clean:144 dh_compress:208 dh_desktop:37 dh_fixperms:128
-#: dh_gconf:116 dh_gencontrol:88 dh_icons:71 dh_install:285
+#: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285
 #: dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83
 #: dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92
 #: dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112
@@ -1605,7 +1605,7 @@ msgstr ""
 #. type: =head1
 #: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31
 #: dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21
-#: dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:45 dh_gencontrol:26
+#: dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26
 #: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60
 #: dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39
@@ -2050,7 +2050,7 @@ msgstr ""
 #. type: textblock
 #: dh:728 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55
 #: dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140
-#: dh_compress:204 dh_fixperms:124 dh_gconf:112 dh_gencontrol:84
+#: dh_compress:204 dh_fixperms:124 dh_gconf:101 dh_gencontrol:84
 #: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:171
 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88
 #: dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108
@@ -2069,7 +2069,7 @@ msgstr "L<debhelper(7)>"
 #. type: textblock
 #: dh:730 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57
 #: dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:95
-#: dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:114
+#: dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:173
 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90
 #: dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110
@@ -2401,7 +2401,7 @@ msgstr ""
 "paquete."
 
 #. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:27 dh_install:38
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38
 #: dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21
 #: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21
 #: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22
@@ -2912,7 +2912,9 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_gconf:5
-msgid "dh_gconf - generate GConf schema registration scripts"
+#, fuzzy
+#| msgid "dh_gconf - generate GConf schema registration scripts"
+msgid "dh_gconf - install GConf defaults files and register schemas"
 msgstr "dh_gconf - genera scripts para registrar esquemas de GConf"
 
 # type: textblock
@@ -2925,62 +2927,50 @@ msgstr "B<dh_gconf> [S<I<opciones debhelper>>] [B<-p<paquete>>]"
 # type: textblock
 #. type: textblock
 #: dh_gconf:18
+#, fuzzy
+#| msgid ""
+#| "dh_gconf is a debhelper program that is responsible for registering GConf "
+#| "schemas."
 msgid ""
-"dh_gconf is a debhelper program that is responsible for registering GConf "
-"schemas."
+"dh_gconf is a debhelper program that is responsible for installing GConf "
+"defaults files and registering GConf schemas."
 msgstr "dh_gconf es un programa de debhelper que registra esquemas de GConf."
 
-# type: textblock
 #. type: textblock
 #: dh_gconf:21
-#, fuzzy
-msgid ""
-"It automatically generates the postinst and prerm fragments needed to "
-"register and unregister the schemas in usr/share/gconf/schemas, using gconf-"
-"schemas."
-msgstr ""
-"Genera automáticamente los fragmentos en los scripts de postinst y prerm "
-"necesarios para registrar y des-registrar los esquemas en usr/share/gconf/"
-"schemas. Estos fragmentos usarán gconftool-2, así que el paquete deberá "
-"depender de gconf2. Este programa añadirá una dependencia a ${misc:Depends}."
-
-#. type: textblock
-#: dh_gconf:25
 msgid ""
 "An appropriate dependency on gconf2 will be generated in ${misc:Depends}."
 msgstr ""
 
 #. type: =item
-#: dh_gconf:31
+#: dh_gconf:27
 msgid "debian/I<package>.gconf-defaults"
 msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:33
+#: dh_gconf:29
 #, fuzzy
 msgid ""
 "Installed into usr/share/gconf/defaults/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name. Some postinst "
-"and postrm fragments will be generated to run update-gconf-defaults."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 "Si existe un fichero llamado debian/paquete.default, se instala en etc/"
 "default/paquete en el directorio de construcción del paquete, con \"paquete"
 "\" reemplazado por el nombre del paquete."
 
 #. type: =item
-#: dh_gconf:37
+#: dh_gconf:32
 msgid "debian/I<package>.gconf-mandatory"
 msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:39
+#: dh_gconf:34
 #, fuzzy
 msgid ""
 "Installed into usr/share/gconf/mandatory/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name, and similar "
-"postinst and postrm fragments will be generated."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 "Si existe un fichero llamado debian/paquete.default, se instala en etc/"
 "default/paquete en el directorio de construcción del paquete, con \"paquete"
@@ -2988,14 +2978,14 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_gconf:49
+#: dh_gconf:43
 #, fuzzy
 msgid "B<--priority> I<priority>"
 msgstr "B<--priority=>I<n>"
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:51
+#: dh_gconf:45
 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 "
@@ -3004,7 +2994,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:118
+#: dh_gconf:107
 #, fuzzy
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Josselin Mouette <joss@debian.org>"
@@ -7683,6 +7673,31 @@ msgstr "Normas de Debian, versión 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+# type: textblock
+#, fuzzy
+#~ msgid ""
+#~ "It automatically generates the postinst and prerm fragments needed to "
+#~ "register and unregister the schemas in usr/share/gconf/schemas, using "
+#~ "gconf-schemas."
+#~ msgstr ""
+#~ "Genera automáticamente los fragmentos en los scripts de postinst y prerm "
+#~ "necesarios para registrar y des-registrar los esquemas en usr/share/gconf/"
+#~ "schemas. Estos fragmentos usarán gconftool-2, así que el paquete deberá "
+#~ "depender de gconf2. Este programa añadirá una dependencia a ${misc:"
+#~ "Depends}."
+
+# type: textblock
+#, fuzzy
+#~ msgid ""
+#~ "Installed into usr/share/gconf/defaults/10_package in the package build "
+#~ "directory, with \"I<package>\" replaced by the package name. Some "
+#~ "postinst and postrm fragments will be generated to run update-gconf-"
+#~ "defaults."
+#~ msgstr ""
+#~ "Si existe un fichero llamado debian/paquete.default, se instala en etc/"
+#~ "default/paquete en el directorio de construcción del paquete, con "
+#~ "\"paquete\" reemplazado por el nombre del paquete."
+
 # type: =head2
 #~ msgid "Doc directory symlinks"
 #~ msgstr "Enlaces a los directorios Doc"
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 2d5c83ac..3869792a 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2010-04-08 18:23-0300\n"
+"POT-Creation-Date: 2010-04-26 16:23-0300\n"
 "PO-Revision-Date: 2010-02-18 21:31+0100\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1548,7 +1548,7 @@ msgstr ""
 #: debhelper.pod:582 dh:726 dh_auto_build:47 dh_auto_clean:48
 #: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122
 #: dh_builddeb:91 dh_clean:138 dh_compress:202 dh_desktop:31 dh_fixperms:122
-#: dh_gconf:110 dh_gencontrol:82 dh_icons:65 dh_install:279
+#: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279
 #: dh_installcatalogs:116 dh_installchangelogs:169 dh_installcron:77
 #: dh_installdeb:108 dh_installdebconf:126 dh_installdirs:86
 #: dh_installdocs:301 dh_installemacsen:124 dh_installexamples:106
@@ -1594,7 +1594,7 @@ msgstr "Le site internet de debhelper."
 #: debhelper.pod:596 dh:732 dh_auto_build:53 dh_auto_clean:54
 #: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130
 #: dh_builddeb:97 dh_clean:144 dh_compress:208 dh_desktop:37 dh_fixperms:128
-#: dh_gconf:116 dh_gencontrol:88 dh_icons:71 dh_install:285
+#: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285
 #: dh_installcatalogs:122 dh_installchangelogs:175 dh_installcron:83
 #: dh_installdeb:114 dh_installdebconf:132 dh_installdirs:92
 #: dh_installdocs:307 dh_installemacsen:130 dh_installexamples:112
@@ -1697,7 +1697,7 @@ msgstr ""
 #. type: =head1
 #: dh:33 dh_auto_build:28 dh_auto_clean:29 dh_auto_configure:31
 #: dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21
-#: dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:45 dh_gencontrol:26
+#: dh_clean:41 dh_compress:46 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26
 #: dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:60
 #: dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39
@@ -2292,7 +2292,7 @@ msgstr ""
 #. type: textblock
 #: dh:728 dh_auto_build:49 dh_auto_clean:50 dh_auto_configure:55
 #: dh_auto_install:87 dh_auto_test:60 dh_builddeb:93 dh_clean:140
-#: dh_compress:204 dh_fixperms:124 dh_gconf:112 dh_gencontrol:84
+#: dh_compress:204 dh_fixperms:124 dh_gconf:101 dh_gencontrol:84
 #: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:171
 #: dh_installcron:79 dh_installdeb:110 dh_installdebconf:128 dh_installdirs:88
 #: dh_installdocs:303 dh_installemacsen:126 dh_installexamples:108
@@ -2311,7 +2311,7 @@ msgstr "L<debhelper(7)>"
 #. type: textblock
 #: dh:730 dh_auto_build:51 dh_auto_clean:52 dh_auto_configure:57
 #: dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:95
-#: dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:114
+#: dh_clean:142 dh_compress:206 dh_desktop:35 dh_fixperms:126 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:173
 #: dh_installcron:81 dh_installdeb:112 dh_installdebconf:130 dh_installdirs:90
 #: dh_installdocs:305 dh_installemacsen:128 dh_installexamples:110
@@ -2747,7 +2747,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:27 dh_install:38
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38
 #: dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21
 #: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21
 #: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22
@@ -3293,7 +3293,9 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_gconf:5
-msgid "dh_gconf - generate GConf schema registration scripts"
+#, fuzzy
+#| msgid "dh_gconf - generate GConf schema registration scripts"
+msgid "dh_gconf - install GConf defaults files and register schemas"
 msgstr "dh_gconf - produit les scripts d'enregistrement du schéma GConf"
 
 # type: textblock
@@ -3305,9 +3307,13 @@ msgstr "B<dh_gconf> [I<options de debhelper>] [B<--priority=<number>>]"
 # type: textblock
 #. type: textblock
 #: dh_gconf:18
+#, fuzzy
+#| msgid ""
+#| "dh_gconf is a debhelper program that is responsible for registering GConf "
+#| "schemas."
 msgid ""
-"dh_gconf is a debhelper program that is responsible for registering GConf "
-"schemas."
+"dh_gconf is a debhelper program that is responsible for installing GConf "
+"defaults files and registering GConf schemas."
 msgstr ""
 "dh_gconf est un programme de la suite debhelper chargé de l'inscription des "
 "schémas GConf."
@@ -3316,55 +3322,50 @@ msgstr ""
 #. type: textblock
 #: dh_gconf:21
 msgid ""
-"It automatically generates the postinst and prerm fragments needed to "
-"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. Cette fonction utilise gconf-"
-"schemas."
-
-# type: textblock
-#. type: textblock
-#: dh_gconf:25
-msgid ""
 "An appropriate dependency on gconf2 will be generated in ${misc:Depends}."
 msgstr ""
 "Une dépendance appropriée envers gconf2 sera inscrite dans ${misc:Depends}."
 
 # type: =item
 #. type: =item
-#: dh_gconf:31
+#: dh_gconf:27
 msgid "debian/I<package>.gconf-defaults"
 msgstr "debian/I<paquet>.gconf-defaults"
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:33
+#: dh_gconf:29
+#, fuzzy
+#| msgid ""
+#| "Installed into usr/share/gconf/mandatory/10_package in the package build "
+#| "directory, with \"I<package>\" replaced by the package name, and similar "
+#| "postinst and postrm fragments will be generated."
 msgid ""
 "Installed into usr/share/gconf/defaults/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name. Some postinst "
-"and postrm fragments will be generated to run update-gconf-defaults."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 "Ce fichier sera installé dans le répertoire de construction du paquet sous "
 "usr/share/gconf/defaults/10_paquet où le mot « 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."
+"nom du paquet. Des lignes de code similaires seront produites dans les "
+"scripts de maintenance postinst et postrm."
 
 # type: =item
 #. type: =item
-#: dh_gconf:37
+#: dh_gconf:32
 msgid "debian/I<package>.gconf-mandatory"
 msgstr "debian/I<paquet>.gconf-mandatory"
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:39
+#: dh_gconf:34
+#, fuzzy
+#| msgid ""
+#| "Installed into usr/share/gconf/mandatory/10_package in the package build "
+#| "directory, with \"I<package>\" replaced by the package name, and similar "
+#| "postinst and postrm fragments will be generated."
 msgid ""
 "Installed into usr/share/gconf/mandatory/10_package in the package build "
-"directory, with \"I<package>\" replaced by the package name, and similar "
-"postinst and postrm fragments will be generated."
+"directory, with \"I<package>\" replaced by the package name."
 msgstr ""
 "Ce fichier sera installé dans le répertoire de construction du paquet sous "
 "usr/share/gconf/defaults/10_paquet où le mot « paquet » sera remplacé par le "
@@ -3373,13 +3374,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_gconf:49
+#: dh_gconf:43
 msgid "B<--priority> I<priority>"
 msgstr "B<--priority> I<priorité>"
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:51
+#: dh_gconf:45
 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 "
@@ -3392,7 +3393,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:118
+#: dh_gconf:107
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 
@@ -8186,6 +8187,29 @@ msgstr "Charte Debian, version 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+# type: textblock
+#~ msgid ""
+#~ "It automatically generates the postinst and prerm fragments needed to "
+#~ "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. Cette fonction "
+#~ "utilise gconf-schemas."
+
+# type: textblock
+#~ msgid ""
+#~ "Installed into usr/share/gconf/defaults/10_package in the package build "
+#~ "directory, with \"I<package>\" replaced by the package name. Some "
+#~ "postinst and postrm fragments will be generated to run update-gconf-"
+#~ "defaults."
+#~ msgstr ""
+#~ "Ce fichier sera installé dans le répertoire de construction du paquet "
+#~ "sous usr/share/gconf/defaults/10_paquet où le mot « 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: =head1
 #~ msgid "COMMAND SPECIFICATION"
 #~ msgstr "NOM DES COMMANDES"