refactor

Should be no behavior changes, although I did drop the comment when
skipping an empty override target.

1 files changed, 233 insertions, 219 deletions

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 3054902e..39b147e2 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -31,7 +31,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 8.0.0\n"
-"POT-Creation-Date: 2011-08-23 15:26-0400\n"
+"POT-Creation-Date: 2011-09-10 18:35-0400\n"
 "PO-Revision-Date: 2010-11-11 22:28+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -70,7 +70,7 @@ msgstr "debhelper - El conjunto de herramientas debhelper"
 # type: =head1
 #. type: =head1
 #: debhelper.pod:5 dh:12 dh_auto_build:12 dh_auto_clean:13
-#: dh_auto_configure:12 dh_auto_install:15 dh_auto_test:12 dh_bugfiles:12
+#: dh_auto_configure:12 dh_auto_install:15 dh_auto_test:13 dh_bugfiles:12
 #: dh_builddeb:12 dh_clean:12 dh_compress:13 dh_desktop:12 dh_fixperms:12
 #: dh_gconf:12 dh_gencontrol:12 dh_icons:13 dh_install:13
 #: dh_installcatalogs:14 dh_installchangelogs:12 dh_installcron:12
@@ -100,7 +100,7 @@ msgstr ""
 # type: =head1
 #. type: =head1
 #: debhelper.pod:9 dh:16 dh_auto_build:16 dh_auto_clean:17
-#: dh_auto_configure:16 dh_auto_install:19 dh_auto_test:16 dh_bugfiles:16
+#: dh_auto_configure:16 dh_auto_install:19 dh_auto_test:17 dh_bugfiles:16
 #: dh_builddeb:16 dh_clean:16 dh_compress:17 dh_desktop:16 dh_fixperms:16
 #: dh_gconf:16 dh_gencontrol:16 dh_icons:17 dh_install:17
 #: dh_installcatalogs:18 dh_installchangelogs:16 dh_installcron:16
@@ -358,7 +358,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:101 dh:76
+#: debhelper.pod:101 dh:56
 msgid "B<--no-act>"
 msgstr "B<--no-act>"
 
@@ -911,7 +911,7 @@ msgstr "Este modo funciona como v2, con los siguientes añadidos:"
 #: debhelper.pod:382 debhelper.pod:388 debhelper.pod:394 debhelper.pod:407
 #: debhelper.pod:414 debhelper.pod:418 debhelper.pod:422 debhelper.pod:437
 #: debhelper.pod:441 debhelper.pod:449 debhelper.pod:454 debhelper.pod:468
-#: debhelper.pod:473 debhelper.pod:479 debhelper.pod:484 debhelper.pod:488
+#: debhelper.pod:473 debhelper.pod:480 debhelper.pod:485 debhelper.pod:489
 msgid "-"
 msgstr "-"
 
@@ -1227,25 +1227,26 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:475
 msgid ""
-"dh allows defining custom build, build-arch, and build-indep targets in "
-"debian/rules, without needing to manually define the other targets that "
-"depend on them."
+"dh is aware of the usual dependencies between targets in debian/rules.  So, "
+"\"dh binary\" will run any build, build-arch, build-indep, install, etc "
+"targets that exist in the rules file. There's no need to define an explicit "
+"binary target with explicit dependencies on the other targets."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:481
+#: debhelper.pod:482
 msgid ""
 "B<dh_auto_configure> does not include the source package name in --"
 "libexecdir when using autoconf."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:486
+#: debhelper.pod:487
 msgid "B<dh> does not default to enabling --with=python-support"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:490
+#: debhelper.pod:491
 msgid ""
 "All of the B<dh_auto_>I<*> debhelper programs and B<dh> set environment "
 "variables listed by B<dpkg-buildflags>, unless they are already set. They "
@@ -1254,7 +1255,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:498 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:116
+#: debhelper.pod:499 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:116
 #: dh_installemacsen:67 dh_installexamples:53 dh_installinit:133
 #: dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55
 #: dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68
@@ -1264,13 +1265,13 @@ msgstr "NOTAS"
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:500
+#: debhelper.pod:501
 msgid "Multiple binary package support"
 msgstr "Compatibilidad con varios paquetes binarios"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:502
+#: debhelper.pod:503
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1291,7 +1292,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:510
+#: debhelper.pod:511
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, B<-"
@@ -1307,13 +1308,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:516
+#: debhelper.pod:517
 msgid "Automatic generation of Debian install scripts"
 msgstr "Generación automática de los scripts de instalación de Debian"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:518
+#: debhelper.pod:519
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1331,7 +1332,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:525
+#: debhelper.pod:526
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1341,7 +1342,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:528
+#: debhelper.pod:529
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1351,7 +1352,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:531
+#: debhelper.pod:532
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1365,7 +1366,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:536
+#: debhelper.pod:537
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1384,13 +1385,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:542
+#: debhelper.pod:543
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Generación automática de diversas dependencias."
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:544
+#: debhelper.pod:545
 #, fuzzy
 #| msgid ""
 #| "Some debhelper commands may make the generated package need to depend on "
@@ -1418,7 +1419,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:552
+#: debhelper.pod:553
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1433,7 +1434,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:558
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by L<dh_perl(1)"
@@ -1447,13 +1448,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:562
+#: debhelper.pod:563
 msgid "Package build directories"
 msgstr "Directorios de construcción del paquete"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:564
+#: debhelper.pod:565
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1464,7 +1465,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:567
+#: debhelper.pod:568
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1484,13 +1485,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:575
+#: debhelper.pod:576
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:577
+#: debhelper.pod:578
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>, and "
@@ -1508,13 +1509,13 @@ msgstr ""
 "F<preinst>, F<postrm>, F<prerm>, scripts F<config>, etc."
 
 #. type: =head2
-#: debhelper.pod:584
+#: debhelper.pod:585
 msgid "Build depends"
 msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:586
+#: debhelper.pod:587
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
 "Build-Depends line in F<debian/control>. You should build-depend on a "
@@ -1529,7 +1530,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:592
+#: debhelper.pod:593
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 7)\n"
@@ -1540,19 +1541,19 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:594
+#: debhelper.pod:595
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:598
+#: debhelper.pod:599
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:600
+#: debhelper.pod:601
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs that modifies files on the build system."
@@ -1563,13 +1564,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:603
+#: debhelper.pod:604
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:605
+#: debhelper.pod:606
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1579,25 +1580,25 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:608
+#: debhelper.pod:609
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:610
+#: debhelper.pod:611
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Defina como B<1> para habilitar el modo no-act."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:612
+#: debhelper.pod:613
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:614
+#: debhelper.pod:615
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. Command-specific options will be ignored by commands "
@@ -1609,7 +1610,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:618
+#: debhelper.pod:619
 msgid ""
 "This is useful in some situations, for example, if you need to pass B<-p> to "
 "all debhelper commands that will be run. One good way to set B<DH_OPTIONS> "
@@ -1624,13 +1625,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:623
+#: debhelper.pod:624
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:625
+#: debhelper.pod:626
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1642,7 +1643,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:629
+#: debhelper.pod:630
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1660,7 +1661,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:636
+#: debhelper.pod:637
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1670,15 +1671,15 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:641 dh:866 dh_auto_build:47 dh_auto_clean:50
-#: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122
-#: dh_builddeb:123 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:129
+#: debhelper.pod:642 dh:858 dh_auto_build:47 dh_auto_clean:50
+#: dh_auto_configure:53 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122
+#: dh_builddeb:120 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:129
 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279
 #: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77
 #: dh_installdeb:144 dh_installdebconf:126 dh_installdirs:86
 #: dh_installdocs:307 dh_installemacsen:124 dh_installexamples:106
 #: dh_installifupdown:69 dh_installinfo:77 dh_installinit:275
-#: dh_installlogcheck:76 dh_installlogrotate:50 dh_installman:258
+#: dh_installlogcheck:76 dh_installlogrotate:50 dh_installman:259
 #: 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
@@ -1691,39 +1692,39 @@ msgstr "VÉASE TAMBIÉN"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:645
+#: debhelper.pod:646
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:647
+#: debhelper.pod:648
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr "Varios ficheros de ejemplo F<debian/rules> que usan debhelper."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:649
+#: debhelper.pod:650
 msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:651
+#: debhelper.pod:652
 msgid "Debhelper web site."
 msgstr "Sitio web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:655 dh:872 dh_auto_build:53 dh_auto_clean:56
-#: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130
-#: dh_builddeb:129 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:135
+#: debhelper.pod:656 dh:864 dh_auto_build:53 dh_auto_clean:56
+#: dh_auto_configure:59 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130
+#: dh_builddeb:126 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:135
 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285
 #: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83
 #: dh_installdeb:150 dh_installdebconf:132 dh_installdirs:92
 #: dh_installdocs:313 dh_installemacsen:130 dh_installexamples:112
 #: dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:82
-#: dh_installlogrotate:56 dh_installman:264 dh_installmanpages:203
+#: dh_installlogrotate:56 dh_installman:265 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:36 dh_makeshlibs:264
@@ -1735,14 +1736,14 @@ msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:657 dh:874 dh_auto_build:55 dh_auto_clean:58
-#: dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:131
+#: debhelper.pod:658 dh:866 dh_auto_build:55 dh_auto_clean:58
+#: dh_auto_configure:61 dh_auto_install:93 dh_auto_test:67 dh_builddeb:128
 #: dh_clean:150 dh_compress:214 dh_fixperms:137 dh_gencontrol:90
 #: dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152
 #: dh_installdebconf:134 dh_installdirs:94 dh_installdocs:315
 #: dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77
 #: dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58
-#: dh_installman:266 dh_installmanpages:205 dh_installmenu:97
+#: dh_installman:267 dh_installmanpages:205 dh_installmenu:97
 #: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73
 #: dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234
 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178
@@ -1758,9 +1759,13 @@ msgstr "dh - Secuenciador de órdenes de debhelper"
 
 #. type: textblock
 #: dh:14
+#, fuzzy
+#| msgid ""
+#| "B<dh> I<sequence> [B<--with> I<addon>[B<,>I<addon> ...]] [B<--list>] [B<--"
+#| "until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] "
+#| "[S<I<debhelper options>>]"
 msgid ""
-"B<dh> I<sequence> [B<--with> I<addon>[B<,>I<addon> ...]] [B<--list>] [B<--"
-"until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] "
+"B<dh> I<sequence> [B<--with> I<addon>[B<,>I<addon> ...]] [B<--list>] "
 "[S<I<debhelper options>>]"
 msgstr ""
 "B<dh> I<secuencia> [B<--with> I<extensión>[,I<extensión>,...]] [B<--list>] "
@@ -1825,12 +1830,12 @@ msgstr ""
 # type: =head1
 #. type: =head1
 #: dh:35 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
-#: dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21
+#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:21
 #: dh_clean:41 dh_compress:48 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:66
 #: dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39
-#: dh_installinfo:31 dh_installinit:48 dh_installlogcheck:42
+#: dh_installinfo:31 dh_installinit:48 dh_installlogcheck:40
 #: 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
@@ -1877,63 +1882,8 @@ msgstr "Lo contrario de B<--with>, desactiva la extensión dada."
 msgid "List all available addons."
 msgstr "Lista todas las extensiones disponibles."
 
-# type: =item
-#. type: =item
-#: dh:56
-msgid "B<--until> I<cmd>"
-msgstr "B<--until> I<orden>"
-
 #. type: textblock
 #: dh:58
-#, fuzzy
-#| msgid "Run commands in the sequence until and including I<cmd>, then stop."
-msgid ""
-"Run commands in the sequence until and including I<cmd>, then stop.  "
-"(Deprecated)"
-msgstr ""
-"Ejecuta las órdenes en la secuencia hasta la I<orden>, inclusive, y cierra."
-
-# type: =item
-#. type: =item
-#: dh:61
-msgid "B<--before> I<cmd>"
-msgstr "B<--before> I<orden>"
-
-#. type: textblock
-#: dh:63
-#, fuzzy
-#| msgid "Run commands in the sequence before I<cmd>, then stop."
-msgid "Run commands in the sequence before I<cmd>, then stop.  (Deprecated)"
-msgstr "Ejecuta las órdenes en la secuencia anteriores a I<orden>, y cierra."
-
-# type: =item
-#. type: =item
-#: dh:66
-msgid "B<--after> I<cmd>"
-msgstr "B<--after> I<orden>"
-
-#. type: textblock
-#: dh:68
-#, fuzzy
-#| msgid "Run commands in the sequence that come after I<cmd>."
-msgid "Run commands in the sequence that come after I<cmd>.  (Deprecated)"
-msgstr "Ejecuta las órdenes en la secuencia posteriores a I<orden>."
-
-# type: =item
-#. type: =item
-#: dh:71
-msgid "B<--remaining>"
-msgstr "B<--remaining>"
-
-#. type: textblock
-#: dh:73
-#, fuzzy
-#| msgid "Run all commands in the sequence that have yet to be run."
-msgid "Run all commands in the sequence that have yet to be run.  (Deprecated)"
-msgstr "Ejecuta todas las órdenes en la secuencia que aún no se han ejecutado."
-
-#. type: textblock
-#: dh:78
 msgid ""
 "Prints commands that would run for a given sequence, but does not run them."
 msgstr ""
@@ -1941,38 +1891,29 @@ msgstr ""
 "ejecuta."
 
 #. type: textblock
-#: dh:82
+#: dh:62
+#, fuzzy
+#| msgid ""
+#| "All other options passed to B<dh> are passed on to each command it runs. "
+#| "This can be used to set an option like B<-v> or B<-X> or B<-N>, as well "
+#| "as for more specialised options."
 msgid ""
-"All other options passed to B<dh> are passed on to each command it runs. "
-"This can be used to set an option like B<-v> or B<-X> or B<-N>, as well as "
-"for more specialised options."
+"Other options passed to B<dh> are passed on to each command it runs. This "
+"can be used to set an option like B<-v> or B<-X> or B<-N>, as well as for "
+"more specialised options."
 msgstr ""
 "Todas las demás opciones introducidas a B<dh> se introducen a cada orden que "
 "ejecuta. Puede usar esto para definir una opción como B<-v>, B<-X> o B<-N>, "
 "así como opciones más especializadas."
 
-#. type: textblock
-#: dh:86
-msgid ""
-"In the above options, I<cmd> can be a full name of a debhelper command, or a "
-"substring. It'll first search for a command in the sequence exactly matching "
-"the name, to avoid any ambiguity. If there are multiple substring matches, "
-"the last one in the sequence will be used."
-msgstr ""
-"En las opciones anteriores, I<orden> puede ser el nombre completo de una "
-"orden de debhelper, o una subcadena. Buscará en primer lugar una orden en la "
-"secuencia que coincide totalmente con el nombre, para evitar cualquier "
-"ambigüedad. Si hay muchas coincidencias con la subcadena se usará la última "
-"en la secuencia."
-
 # type: =head1
 #. type: =head1
-#: dh:117 dh_installdocs:105 dh_link:73 dh_makeshlibs:97 dh_shlibdeps:69
+#: dh:66 dh_installdocs:105 dh_link:73 dh_makeshlibs:97 dh_shlibdeps:69
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
 #. type: textblock
-#: dh:119
+#: dh:68
 msgid ""
 "To see what commands are included in a sequence, without actually doing "
 "anything:"
@@ -1981,7 +1922,7 @@ msgstr ""
 "realidad:"
 
 #. type: verbatim
-#: dh:122
+#: dh:71
 #, no-wrap
 msgid ""
 "\tdh binary-arch --no-act\n"
@@ -1991,7 +1932,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:124
+#: dh:73
 msgid ""
 "This is a very simple rules file, for packages where the default sequences "
 "of commands work with no additional options."
@@ -2000,7 +1941,7 @@ msgstr ""
 "predeterminadas de órdenes funcionan sin opciones adicionales."
 
 #. type: verbatim
-#: dh:127 dh:134 dh:148 dh:161
+#: dh:76 dh:83 dh:97 dh:110
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2014,7 +1955,7 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: dh:131
+#: dh:80
 #, no-wrap
 msgid ""
 "Often you'll want to pass an option to a specific debhelper command. The\n"
@@ -2027,7 +1968,7 @@ msgstr ""
 "\t\n"
 
 #. type: verbatim
-#: dh:138
+#: dh:87
 #, no-wrap
 msgid ""
 "\toverride_dh_strip:\n"
@@ -2039,7 +1980,7 @@ msgstr ""
 "\t\t\n"
 
 #. type: verbatim
-#: dh:141
+#: dh:90
 #, no-wrap
 msgid ""
 "\toverride_dh_installdocs:\n"
@@ -2051,7 +1992,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:144
+#: dh:93
 msgid ""
 "Sometimes the automated L<dh_auto_configure(1)> and L<dh_auto_build(1)> "
 "can't guess what to do for a strange package. Here's how to avoid running "
@@ -2063,7 +2004,7 @@ msgstr ""
 "ejecutar sus propias órdenes."
 
 #. type: verbatim
-#: dh:152
+#: dh:101
 #, no-wrap
 msgid ""
 "\toverride_dh_auto_configure:\n"
@@ -2075,7 +2016,7 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: dh:155
+#: dh:104
 #, no-wrap
 msgid ""
 "\toverride_dh_auto_build:\n"
@@ -2087,7 +2028,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:158
+#: dh:107
 msgid ""
 "Another common case is wanting to do something manually before or after a "
 "particular debhelper command is run."
@@ -2096,7 +2037,7 @@ msgstr ""
 "se ejecute una orden en particular de debhelper."
 
 #. type: verbatim
-#: dh:165
+#: dh:114
 #, no-wrap
 msgid ""
 "\toverride_dh_fixperms:\n"
@@ -2110,7 +2051,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:169
+#: dh:118
 msgid ""
 "Python tools are not run by dh by default, due to the continual change in "
 "that area. (Before compatability level v9, dh does run B<dh_pysupport>.)  "
@@ -2118,7 +2059,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:173
+#: dh:122
 #, fuzzy, no-wrap
 #| msgid ""
 #| "\t#!/usr/bin/make -f\n"
@@ -2137,7 +2078,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:177
+#: dh:126
 msgid ""
 "If your package uses autotools and you want to freshen F<config.sub> and "
 "F<config.guess> with newer versions from the B<autotools-dev> package at "
@@ -2150,7 +2091,7 @@ msgstr ""
 "que automatizan esto, como puede ver a continuación."
 
 #. type: verbatim
-#: dh:182
+#: dh:131
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2164,7 +2105,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:186
+#: dh:135
 msgid ""
 "Here is how to force use of Perl's B<Module::Build> build system, which can "
 "be necessary if debhelper wrongly detects that the package uses MakeMaker."
@@ -2174,7 +2115,7 @@ msgstr ""
 "detecta erróneamente que el paquete usa MakeMaker."
 
 #. type: verbatim
-#: dh:190
+#: dh:139
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2187,34 +2128,8 @@ msgstr ""
 "\t\tdh $@ --buildsystem=perl_build\n"
 "\n"
 
-#. type: verbatim
-#: dh:194
-#, no-wrap
-msgid ""
-"To patch your package using quilt, you can tell B<dh> to use quilt's B<dh>\n"
-"sequence addons like this:\n"
-"\t\n"
-msgstr ""
-"Para parchear su paquete mediante quilt, puede indicar a B<dh> que\n"
-"use las extensiones de secuencia de quilt para B<dh>, como puede ver:\n"
-"\t\n"
-
-#. type: verbatim
-#: dh:197
-#, no-wrap
-msgid ""
-"\t#!/usr/bin/make -f\n"
-"\t%:\n"
-"\t\tdh $@ --with quilt\n"
-"\n"
-msgstr ""
-"\t#!/usr/bin/make -f\n"
-"\t%:\n"
-"\t\tdh $@ --with quilt\n"
-"\n"
-
 #. type: textblock
-#: dh:201
+#: dh:143
 msgid ""
 "Here is an example of overriding where the B<dh_auto_>I<*> commands find the "
 "package's source, for a package where the source is located in a "
@@ -2225,7 +2140,7 @@ msgstr ""
 "en el que las fuentes se ubican en un subdirectorio."
 
 #. type: verbatim
-#: dh:205
+#: dh:147
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2239,7 +2154,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:209
+#: dh:151
 msgid ""
 "And here is an example of how to tell the B<dh_auto_>I<*> commands to build "
 "in a subdirectory, which will be removed on B<clean>."
@@ -2249,7 +2164,7 @@ msgstr ""
 "B<clean>."
 
 #. type: verbatim
-#: dh:212
+#: dh:154
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2263,7 +2178,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:216
+#: dh:158
 msgid ""
 "If your package can be built in parallel, you can support parallel building "
 "as follows. Then B<dpkg-buildpackage -j> will work."
@@ -2273,7 +2188,7 @@ msgstr ""
 "j> funcionará."
 
 #. type: verbatim
-#: dh:219
+#: dh:161
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2287,7 +2202,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:223
+#: dh:165
 msgid ""
 "Here is a way to prevent B<dh> from running several commands that you don't "
 "want it to run, by defining empty override targets for each command."
@@ -2297,7 +2212,7 @@ msgstr ""
 "cada orden."
 
 #. type: verbatim
-#: dh:226 dh:237 dh:254
+#: dh:168 dh:179 dh:196
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -2311,7 +2226,7 @@ msgstr ""
 "\t\n"
 
 #. type: verbatim
-#: dh:230
+#: dh:172
 #, no-wrap
 msgid ""
 "\t# Commands not to run:\n"
@@ -2323,7 +2238,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:233
+#: dh:175
 msgid ""
 "Sometimes, you may need to make an override target only run commands when a "
 "particular package is being built. This can be accomplished using "
@@ -2335,7 +2250,7 @@ msgstr ""
 "ejemplo:"
 
 #. type: verbatim
-#: dh:241
+#: dh:183
 #, fuzzy, no-wrap
 #| msgid ""
 #| "\toverride_dh_fixperms:\n"
@@ -2360,7 +2275,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:247
+#: dh:189
 #, fuzzy
 #| msgid ""
 #| "Finally, remember that you are not limited to using override targets in "
@@ -2387,7 +2302,7 @@ msgstr ""
 "demonios de construcción generen la documentación de forma innecesaria."
 
 #. type: verbatim
-#: dh:258
+#: dh:200
 #, fuzzy, no-wrap
 #| msgid ""
 #| "\tbuild: build-arch build-indep ;\n"
@@ -2411,7 +2326,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh:263
+#: dh:205
 msgid ""
 "Note that in the example above, dh will arrange for \"debian/rules build\" "
 "to call your build-indep and build-arch targets. You do not need to "
@@ -2421,12 +2336,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:269
+#: dh:211
 msgid "INTERNALS"
 msgstr "FUNCIONAMIENTO INTERNO"
 
 #. type: textblock
-#: dh:271
+#: dh:213
 msgid ""
 "If you're curious about B<dh>'s internals, here's how it works under the "
 "hood."
@@ -2435,7 +2350,7 @@ msgstr ""
 "puede ver como funciona por dentro."
 
 #. type: textblock
-#: dh:273
+#: dh:215
 msgid ""
 "Each debhelper command will record when it's successfully run in F<debian/"
 "package.debhelper.log>. (Which B<dh_clean> deletes.) So B<dh> can tell which "
@@ -2448,7 +2363,7 @@ msgstr ""
 "esas órdenes otra vez."
 
 #. type: textblock
-#: dh:278
+#: dh:220
 msgid ""
 "Each time B<dh> is run, it examines the log, and finds the last logged "
 "command that is in the specified sequence. It then continues with the next "
@@ -2461,14 +2376,14 @@ msgstr ""
 "before>, B<--after> y B<--remaining> pueden anular este comportamiento."
 
 #. type: textblock
-#: dh:283
+#: dh:225
 msgid ""
 "A sequence can also run dependent targets in debian/rules.  For example, the "
 "\"binary\" sequence runs the \"install\" target."
 msgstr ""
 
 #. type: textblock
-#: dh:286
+#: dh:228
 msgid ""
 "B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass "
 "information through to debhelper commands that are run inside override "
@@ -2480,16 +2395,95 @@ msgstr ""
 "«override». El contenido (e incluso, la existencia) de esta variable de "
 "entorno, como el nombre sugiere, está sujeto a cambios en cualquier momento."
 
+#. type: =head1
+#: dh:233
+msgid "DEPRECATED OPTIONS"
+msgstr ""
+
+#. type: textblock
+#: dh:235
+msgid ""
+"The following options are deprecated. It's much better to use override "
+"targets instead."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh:240
+msgid "B<--until> I<cmd>"
+msgstr "B<--until> I<orden>"
+
+#. type: textblock
+#: dh:242
+#, fuzzy
+#| msgid "Run commands in the sequence until and including I<cmd>, then stop."
+msgid "Run commands in the sequence until and including I<cmd>, then stop."
+msgstr ""
+"Ejecuta las órdenes en la secuencia hasta la I<orden>, inclusive, y cierra."
+
+# type: =item
+#. type: =item
+#: dh:244
+msgid "B<--before> I<cmd>"
+msgstr "B<--before> I<orden>"
+
+#. type: textblock
+#: dh:246
+#, fuzzy
+#| msgid "Run commands in the sequence before I<cmd>, then stop."
+msgid "Run commands in the sequence before I<cmd>, then stop."
+msgstr "Ejecuta las órdenes en la secuencia anteriores a I<orden>, y cierra."
+
+# type: =item
+#. type: =item
+#: dh:248
+msgid "B<--after> I<cmd>"
+msgstr "B<--after> I<orden>"
+
+#. type: textblock
+#: dh:250
+#, fuzzy
+#| msgid "Run commands in the sequence that come after I<cmd>."
+msgid "Run commands in the sequence that come after I<cmd>."
+msgstr "Ejecuta las órdenes en la secuencia posteriores a I<orden>."
+
+# type: =item
+#. type: =item
+#: dh:252
+msgid "B<--remaining>"
+msgstr "B<--remaining>"
+
+#. type: textblock
+#: dh:254
+#, fuzzy
+#| msgid "Run all commands in the sequence that have yet to be run."
+msgid "Run all commands in the sequence that have yet to be run."
+msgstr "Ejecuta todas las órdenes en la secuencia que aún no se han ejecutado."
+
+#. type: textblock
+#: dh:258
+msgid ""
+"In the above options, I<cmd> can be a full name of a debhelper command, or a "
+"substring. It'll first search for a command in the sequence exactly matching "
+"the name, to avoid any ambiguity. If there are multiple substring matches, "
+"the last one in the sequence will be used."
+msgstr ""
+"En las opciones anteriores, I<orden> puede ser el nombre completo de una "
+"orden de debhelper, o una subcadena. Buscará en primer lugar una orden en la "
+"secuencia que coincide totalmente con el nombre, para evitar cualquier "
+"ambigüedad. Si hay muchas coincidencias con la subcadena se usará la última "
+"en la secuencia."
+
 # type: textblock
 #. type: textblock
-#: dh:868 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:55
-#: dh_auto_install:87 dh_auto_test:60 dh_builddeb:125 dh_clean:144
+#: dh:860 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:55
+#: dh_auto_install:87 dh_auto_test:61 dh_builddeb:122 dh_clean:144
 #: dh_compress:208 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84
 #: dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173
 #: dh_installcron:79 dh_installdeb:146 dh_installdebconf:128 dh_installdirs:88
 #: dh_installdocs:309 dh_installemacsen:126 dh_installexamples:108
 #: dh_installifupdown:71 dh_installinfo:79 dh_installinit:277
-#: dh_installlogcheck:78 dh_installlogrotate:52 dh_installman:260
+#: dh_installlogcheck:78 dh_installlogrotate:52 dh_installman:261
 #: 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:32 dh_makeshlibs:260
@@ -2501,14 +2495,14 @@ msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh:870 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:57
-#: dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:127
+#: dh:862 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:57
+#: dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:124
 #: dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:133 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175
 #: dh_installcron:81 dh_installdeb:148 dh_installdebconf:130 dh_installdirs:90
 #: dh_installdocs:311 dh_installemacsen:128 dh_installexamples:110
 #: dh_installifupdown:73 dh_installinfo:81 dh_installinit:279
-#: dh_installlogrotate:54 dh_installman:262 dh_installmanpages:201
+#: dh_installlogrotate:54 dh_installman:263 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:34 dh_makeshlibs:262
@@ -2563,7 +2557,7 @@ msgstr ""
 
 #. type: textblock
 #: dh_auto_build:30 dh_auto_clean:32 dh_auto_configure:33 dh_auto_install:45
-#: dh_auto_test:32
+#: dh_auto_test:33
 msgid ""
 "See L<debhelper(7)/B<BUILD SYSTEM OPTIONS>> for a list of common build "
 "system selection and control options."
@@ -2574,7 +2568,7 @@ msgstr ""
 # type: =item
 #. type: =item
 #: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56
-#: dh_auto_test:37 dh_builddeb:35 dh_gencontrol:30 dh_installdebconf:69
+#: dh_auto_test:38 dh_builddeb:35 dh_gencontrol:30 dh_installdebconf:69
 #: dh_installinit:99 dh_makeshlibs:91 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr "B<--> I<parámetros>"
@@ -2821,7 +2815,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_auto_test:14
+#: dh_auto_test:15
 msgid ""
 "B<dh_auto_test> [S<I<build system options>>] [S<I<debhelper options>>] "
 "[S<B<--> I<params>>]"
@@ -2830,7 +2824,7 @@ msgstr ""
 "debhelper>>] [S<B<--> I<parámetros>>]"
 
 #. type: textblock
-#: dh_auto_test:18
+#: dh_auto_test:19
 msgid ""
 "B<dh_auto_test> is a debhelper program that tries to automatically run a "
 "package's test suite. It does so by running the appropriate command for the "
@@ -2850,7 +2844,7 @@ msgstr ""
 "cero sin hacer nada."
 
 #. type: textblock
-#: dh_auto_test:26
+#: dh_auto_test:27
 msgid ""
 "This is intended to work for about 90% of packages with a test suite. If it "
 "doesn't work, you're encouraged to skip using B<dh_auto_test> at all, and "
@@ -2861,7 +2855,7 @@ msgstr ""
 "simplemente ejecute el conjunto de pruebas manualmente."
 
 #. type: textblock
-#: dh_auto_test:39
+#: dh_auto_test:40
 msgid ""
 "Pass I<params> to the program that is run. These can be used to supplement "
 "or override the any standard parameters that B<dh_auto_test> passes."
@@ -2871,7 +2865,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_auto_test:46
+#: dh_auto_test:47
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nocheck>, no "
 "tests will be performed."
@@ -4333,7 +4327,7 @@ msgstr ""
 # type: =item
 #. type: =item
 #: dh_installcron:44 dh_installifupdown:43 dh_installinit:104
-#: dh_installlogcheck:46 dh_installlogrotate:26 dh_installmodules:52
+#: dh_installlogcheck:44 dh_installlogrotate:26 dh_installmodules:52
 #: dh_installpam:35 dh_installppp:39 dh_installudev:39
 msgid "B<--name=>I<name>"
 msgstr "B<--name=>I<nombre>"
@@ -5636,7 +5630,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installlogcheck:48
+#: dh_installlogcheck:46
 #, fuzzy
 #| msgid ""
 #| "Look for files named F<debian/package.name.logrotate> and install them as "
@@ -8310,6 +8304,26 @@ msgstr "Normas de Debian, versión 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+#~ msgid ""
+#~ "To patch your package using quilt, you can tell B<dh> to use quilt's B<dh>\n"
+#~ "sequence addons like this:\n"
+#~ "\t\n"
+#~ msgstr ""
+#~ "Para parchear su paquete mediante quilt, puede indicar a B<dh> que\n"
+#~ "use las extensiones de secuencia de quilt para B<dh>, como puede ver:\n"
+#~ "\t\n"
+
+#~ msgid ""
+#~ "\t#!/usr/bin/make -f\n"
+#~ "\t%:\n"
+#~ "\t\tdh $@ --with quilt\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t#!/usr/bin/make -f\n"
+#~ "\t%:\n"
+#~ "\t\tdh $@ --with quilt\n"
+#~ "\n"
+
 # type: =head2
 #~ msgid "Debhelper compatibility levels"
 #~ msgstr "Niveles de compatibilidad de debhelper"