r1864: releasing version 5.0.19

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index c698b7c5ab67747892f3c6e72f6174e50463c581..5e3ffacf6239f0655ff60dd4e4c7bcd982a35fd5 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -165,6 +165,8 @@ sub parseopts {
                "keep-debug" => \$options{KEEP_DEBUG},
                
                "error-handler=s" => \$options{ERROR_HANDLER},
+               
+               "language=s" => \$options{LANGUAGE},
 
                "<>" => \&NonOption,
        );

diff --git a/debian/changelog b/debian/changelog
index 9fde9a67902a62cdccc55965f64819c976bb847c..aa79361604030c14d5d408b49f881af82209a272 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.19) unstable; urgency=low
+
+  * dh_installman: add support for --language option to override man page
+    language guessing. Closes: #193221
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 23 Jan 2006 18:52:00 -0500
+
 debhelper (5.0.18) unstable; urgency=low
 
   * Improved po4a cleaning. Closes: #348521

diff --git a/dh_installman b/dh_installman
index 1d03898e3901af646cfd195b8e48b4e9bccb258b..df0ad44e5f6f6d636601de6fff93948e40189e52 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -27,7 +27,7 @@ extension of ".3perl"). If your .TH line is incorrect or missing, the program
 may guess wrong based on the file extension.
 
 It also supports translated man pages, by looking for extensions
-like .ll.8 and .ll_LL.8
+like .ll.8 and .ll_LL.8, or by use of the --language switch.
 
 If dh_installman seems to install a man page into the wrong section or with
 the wrong extension, this is because the man page has the wrong section
@@ -36,8 +36,7 @@ dh_installman will follow suit.  See to L<man(7)> for details about the .TH
 section. If dh_installman seems to install a man page into a directory
 like /usr/share/man/pl/man1/, that is because your program has a
 name like "foo.pl", and dh_installman assumes that means it is translated
-into Polish. There is currently no support for resolving this ambiguity;
-programs in debian should probably not have extensions like that anyway.
+into Polish. Use --language=C to avoid this.
 
 Any man page filenames specified as parameters will be installed into the
 first package dh_installman is told to act on. By default, this is the
@@ -60,6 +59,11 @@ is acting on contain ".so" links. If so, it changes them to symlinks.
 Install all files specified by command line parameters in ALL packages
 acted on.
 
+=item B<--language>=ll
+
+Use this to specify that the man pages being acted on are written in the
+specified language.
+
 =item I<manpage ...>
 
 Install these man pages into the first package acted on. (Or in all
@@ -138,15 +142,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                my ($instname)=$basename=~m/^(.*)\./;
        
                my $destdir="$tmp/usr/share/man/man$realsection/";
-               # Translated man pages are typically specified by adding the
-               # language code to the filename, so detect that and
-               # redirect to appropriate directory, stripping the code.
-               my ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
-               if (defined $langcode && $langcode ne '') {
-                       $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
+               my $langcode;
+               if (! exists $dh{LANGUAGE}) {
+                       # Translated man pages are typically specified by adding the
+                       # language code to the filename, so detect that and
+                       # redirect to appropriate directory, stripping the code.
+                       ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
                        # Strip the language code from the instname.
                        $instname=~s/\.$langcode$//;
                }
+               elsif ($dh{LANGUAGE} ne 'C') {
+                       $langcode=$dh{LANGUAGE};
+                       ($instname)=$basename=~m/(.*?)\./;
+               }
+               
+               if (defined $langcode && $langcode ne '') {
+                       $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
+               }
                $destdir=~tr:/:/:s; # just for looks
 
                if (! -e "$destdir/$instname.$section" && 

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index a33daeb065e32d67279599cdc9411731798d4d54..bcdaef0c1a0b15aaad5c711443fb5f911952950e 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -144,6 +144,7 @@ switch              variable        description
 --name         NAME            a name to use for installed files, instead of
                                the package name
 --error-handler        ERROR_HANDLER   a function to call on error
+--language     LANGUAGE        specify what language a file is in
 
 Any additional command line parameters that do not start with "-" will be 
 ignored, and you can access them later just as you normally would.

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 32ed7bbaba5cf51d444b5c00e61c448494312ce1..dbcc52578f8b898bf762a2f71298c2c7bfe185b4 100644 (file)
--- 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: 2005-12-05 14:32-0500\n"
+"POT-Creation-Date: 2006-01-22  0:12+0100\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"
@@ -95,18 +95,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 "OPCIONES"
 
 # 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<nombre>"
@@ -125,11 +126,11 @@ 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:197 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
@@ -142,10 +143,10 @@ msgstr "V
 # 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:199 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
@@ -158,10 +159,10 @@ 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:201 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
@@ -173,11 +174,11 @@ msgstr "Este programa es parte 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:203 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
@@ -190,10 +191,10 @@ msgstr "AUTOR"
 # 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:205 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
@@ -296,14 +297,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:99 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 "NOTAS"
 
 # type: textblock
-#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:94 dh_usrlocal:50
+#: dh_installemacsen:55 dh_installinfo:58 dh_installinit:101 dh_usrlocal:50
 #: dh_installmodules:54 dh_scrollkeeper:43 dh_installmime:42 dh_installwm:51
 #: dh_installcatalogs:54
 msgid ""
@@ -856,7 +857,7 @@ msgid "B<-Xitem>, B<--exclude=item>"
 msgstr "B<-Xelemento>, B<--exclude=elemento>"
 
 # 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."
@@ -975,21 +976,36 @@ msgstr "No modifica los scripts de postinst/postrm/prerm."
 
 # type: =item
 #: dh_installinit:41
+#, fuzzy
+msgid "B<-o>, B<--onlyscripts>"
+msgstr "B<-n>, B<--noscripts>"
+
+# 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 ""
+
+# 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 "No reinicia el script de init después de una actualización."
 
 # 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."
@@ -998,12 +1014,12 @@ msgstr ""
 "cuando se desinstale. Sólo llama a update-rc.d. Útil para scripts de 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 "
@@ -1018,18 +1034,18 @@ msgstr ""
 "preferencia sobre --init-script)."
 
 # type: =item
-#: dh_installinit:58
+#: dh_installinit:65
 msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
 msgstr "B<-u>I<parámetros> B<--update-rcd-params=>I<parámetros>"
 
 # 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<parámetros>"
 
 # 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)>."
@@ -1038,7 +1054,7 @@ msgstr ""
 "\"defaults\" a 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 "
@@ -1053,12 +1069,12 @@ msgstr ""
 "debian/paquete.init y debian/paquete.default, y los instala."
 
 # type: =item
-#: dh_installinit:73
+#: dh_installinit:80
 msgid "B<--init-script=>I<scriptname>"
 msgstr "B<--init-script=>I<nombrescript>"
 
 # 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 "
@@ -1075,17 +1091,17 @@ msgstr ""
 "que instala normalmente."
 
 # type: textblock
-#: dh_installinit:82
+#: dh_installinit:89
 msgid "This parameter is deprecated, use the --name parameter instead."
 msgstr "Se desaconseja el uso de esta opción, use --name en su lugar."
 
 # type: =item
-#: dh_installinit:84
+#: dh_installinit:91
 msgid "B<--error-handler=>I<function>"
 msgstr "B<--error-handler=>I<función>"
 
 # type: textblock
-#: dh_installinit:86
+#: dh_installinit:93
 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# "
@@ -1183,11 +1199,11 @@ msgstr "dh_gconf es un programa de debhelper que registra esquemas de GConf."
 
 # 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.  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 ""
 "Genera automáticamente los fragmentos en los scripts de postinst y prerm "
 "necesarios para registrar y des-registrar los esquemas en usr/share/gconf/"
@@ -1195,18 +1211,45 @@ msgstr ""
 "depender de gconf2. Este programa añadirá una dependencia a ${misc:Depends}."
 
 # type: textblock
-#: dh_gconf:26
+#: dh_gconf:25
+#, fuzzy
 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 ""
-"El script de postinst además enviará una señal a gconfd-2 de forma que los "
-"esquemas instalados estén disponibles inmediatamente."
+"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: 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 ""
+
+# type: =item
+#: dh_gconf:38
+#, fuzzy
+msgid "B<--priority> I<priority>"
+msgstr "B<--priority=>I<n>"
+
+# 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 ""
+
+# type: textblock
+#: dh_gconf:98
+#, fuzzy
+msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
+msgstr "Josselin Mouette <joss@debian.org>"
 
 # type: textblock
 #: dh_installmodules:5
@@ -2056,7 +2099,7 @@ msgstr "Este modo funciona como el V2 con los siguientes a
 # 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 "-"
 
@@ -2162,13 +2205,18 @@ msgstr ""
 msgid "dh_installdocs skips installing empty files."
 msgstr "dh_installdocs no instala ficheros vacíos."
 
+# type: textblock
+#: debhelper.pod:351
+msgid "dh_install errors out if wildcards expand to nothing."
+msgstr ""
+
 # type: =head2
-#: debhelper.pod:353
+#: debhelper.pod:357
 msgid "Doc directory symlinks"
 msgstr "Enlaces a los directorios Doc"
 
 # 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 "
@@ -2190,12 +2238,12 @@ msgstr ""
 "colgante y no tratará de instalar un fichero de copyright o 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 "
@@ -2213,12 +2261,12 @@ msgstr ""
 "preinst, postrm, prerm, y de configuración, etc."
 
 # type: =head2
-#: debhelper.pod:373
+#: debhelper.pod:377
 msgid "Other notes"
 msgstr "Otras notas"
 
 # 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 "
@@ -2234,7 +2282,7 @@ msgstr ""
 "archivos del menú, etc."
 
 # type: textblock
-#: debhelper.pod:381
+#: debhelper.pod:385
 #, fuzzy
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
@@ -2249,7 +2297,7 @@ msgstr ""
 "paquete usa el nivel de compatibilidad 4:"
 
 # type: verbatim
-#: debhelper.pod:387
+#: debhelper.pod:391
 #, fuzzy, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 5)\n"
@@ -2259,17 +2307,17 @@ msgstr ""
 "\n"
 
 # type: =head1
-#: debhelper.pod:389
+#: debhelper.pod:393
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 # 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."
@@ -2279,12 +2327,12 @@ msgstr ""
 "construcción."
 
 # 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."
@@ -2293,22 +2341,22 @@ msgstr ""
 "debhelper, ignorando cualquier valor en 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 "Poner a 1 para habilitar el modo 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 "
@@ -2324,12 +2372,12 @@ msgstr ""
 "Lea la documentación de make para los detalles sobre como hacer esto."
 
 # 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 "
@@ -2340,7 +2388,7 @@ msgstr ""
 "coincida con el valor en el árbol de construcción."
 
 # 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 "
@@ -2357,7 +2405,7 @@ msgstr ""
 "sitio donde se construya el paquete."
 
 # 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"
@@ -2366,22 +2414,22 @@ msgstr ""
 "puntos, p. ej.: 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 "Varios ficheros de ejemplo debian/rules que usan 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 "Web de Debhelper."
 
@@ -2826,6 +2874,11 @@ msgstr "No modifica programas F<postinst>/F<postrm>."
 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"
@@ -4830,6 +4883,16 @@ msgstr ""
 "Si su paquete necesita registrar más de un documento, necesita múltiples "
 "ficheros. Para esto puede usar ficheros llamados debian/paquete.doc-base.*"
 
+# type: textblock
+#: dh_installdocs:66
+#, fuzzy
+msgid ""
+"Exclude files that contain \"item\" anywhere in their filename from being "
+"installed. Note that this includes doc-base files."
+msgstr ""
+"Excluye ficheros que contienen \"elemento\" en cualquier lugar de su nombre, "
+"de ser listados en el fichero md5sums."
+
 # type: textblock
 #: dh_installdocs:71
 msgid ""
@@ -5203,6 +5266,14 @@ msgstr ""
 msgid "Jon Middleton <jjm@debian.org>"
 msgstr "Jon Middleton <jjm@debian.org>"
 
+# type: textblock
+#~ msgid ""
+#~ "The postinst script will also signal gconfd-2 so that the newly installed "
+#~ "schemas are available straight away."
+#~ msgstr ""
+#~ "El script de postinst además enviará una señal a gconfd-2 de forma que "
+#~ "los esquemas instalados estén disponibles inmediatamente."
+
 # type: textblock
 #~ msgid "This mode is still under development. Its changes from V4 are:"
 #~ msgstr ""