Update POT and PO files

Signed-off-by: Niels Thykier <niels@thykier.net>

6 files changed, 130 insertions, 104 deletions

diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 3b1cb1f3..f82fef4c 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 10.10.10\n"
 "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n"
-"POT-Creation-Date: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\n"
 "PO-Revision-Date: 2017-12-12 18:01+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2634,19 +2634,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217
 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97
 #: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242
 #: dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75
 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302
-#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128
+#: dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128
 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175
 #: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425
 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53
 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63
 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102
 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60
-#: dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161
+#: dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161
 #: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63
 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
@@ -2675,36 +2675,36 @@ msgid "Debhelper web site."
 msgstr "Debhelper-Website"
 
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61
 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141
 #: dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170
 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356
 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84
-#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134
+#: dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134
 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181
 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93
 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368
 #: dh_installmanpages:204 dh_installmenu:96 dh_installmime:69
 #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108
 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68
-#: dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167
+#: dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167
 #: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69
 #: dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63
 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182
 #: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215
-#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412
+#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418
 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452
 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80
 #: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61
 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71
 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110
 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43
-#: dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78
+#: dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78
 #: dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2898,17 +2898,17 @@ msgstr ""
 "expandieren."
 
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57
 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176
 #: dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107
 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127
-#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406
+#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412
 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446
 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109
 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364
 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111
 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131
-#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438
+#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439
 #: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434
 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
@@ -3639,18 +3639,18 @@ msgstr ""
 "architekturabhängigen Paketen funktionieren."
 
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178
 #: dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109
 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306
-#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132
+#: dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132
 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179
 #: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429
 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366
 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67
 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106
 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64
-#: dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165
+#: dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165
 #: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67
 #: dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
@@ -5722,7 +5722,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -5904,12 +5905,15 @@ msgstr ""
 #. type: textblock
 #: dh_installdeb:203
 msgid ""
-"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 #. type: textblock
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index d7d98bb6..f94034ce 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: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\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"
@@ -1966,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205 dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97 dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242 dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75 dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302 dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128 dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175 dh_installifupdown:72 dh_installinfo:107 dh_installinit:425 dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53 dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63 dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102 dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60 dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161 dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63 dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217 dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97 dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242 dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75 dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302 dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128 dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175 dh_installifupdown:72 dh_installinfo:107 dh_installinit:425 dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53 dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63 dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102 dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60 dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161 dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63 dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
 msgstr ""
 
@@ -1991,12 +1991,12 @@ msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61 dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141 dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170 dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356 dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84 dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134 dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181 dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93 dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368 dh_installmanpages:204 dh_installmenu:96 dh_installmime:69 dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108 dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68 dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167 dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69 dh_testroot:97 dh_usrlocal:142
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61 dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141 dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170 dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356 dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84 dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134 dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181 dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93 dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368 dh_installmanpages:204 dh_installmenu:96 dh_installmime:69 dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108 dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68 dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167 dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69 dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63 dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182 dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215 dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412 dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452 dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80 dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61 dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71 dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110 dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43 dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78 dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63 dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182 dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215 dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418 dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452 dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80 dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61 dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71 dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110 dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43 dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78 dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -2152,7 +2152,7 @@ msgid "B<dh_install> errors out if wildcards expand to nothing."
 msgstr ""
 
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57 dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176 dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107 dh_gencontrol:209 dh_install:352 dh_installcatalogs:127 dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406 dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446 dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109 dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364 dh_installmanpages:200 dh_installmime:65 dh_installmodules:111 dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131 dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438 dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434 dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57 dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176 dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107 dh_gencontrol:209 dh_install:352 dh_installcatalogs:127 dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412 dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446 dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109 dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364 dh_installmanpages:200 dh_installmime:65 dh_installmodules:111 dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131 dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439 dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434 dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
 msgstr ""
 
@@ -2678,7 +2678,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62 dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178 dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109 dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306 dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132 dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179 dh_installifupdown:76 dh_installinfo:111 dh_installinit:429 dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366 dh_installmanpages:202 dh_installmenu:94 dh_installmime:67 dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106 dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64 dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165 dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67 dh_testroot:95 dh_usrlocal:140
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62 dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178 dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109 dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306 dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132 dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179 dh_installifupdown:76 dh_installinfo:111 dh_installinit:429 dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366 dh_installmanpages:202 dh_installmenu:94 dh_installmime:67 dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106 dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64 dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165 dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67 dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -4278,7 +4278,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -4457,12 +4458,17 @@ msgstr ""
 
 #. type: textblock
 #: dh_installdeb:203
-msgid "All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+msgid ""
+"All tokens intended to be substituted must match the regex: "
+"#[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 #. type: textblock
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 916b5492..1d04cafe 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20120609\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\n"
 "PO-Revision-Date: 2012-08-20 11:17+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2568,19 +2568,19 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217
 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97
 #: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242
 #: dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75
 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302
-#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128
+#: dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128
 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175
 #: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425
 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53
 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63
 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102
 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60
-#: dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161
+#: dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161
 #: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63
 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
@@ -2614,19 +2614,19 @@ msgstr "Sitio web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61
 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141
 #: dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170
 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356
 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84
-#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134
+#: dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134
 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181
 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93
 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368
 #: dh_installmanpages:204 dh_installmenu:96 dh_installmime:69
 #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108
 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68
-#: dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167
+#: dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167
 #: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69
 #: dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
@@ -2634,17 +2634,17 @@ msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63
 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182
 #: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215
-#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412
+#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418
 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452
 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80
 #: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61
 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71
 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110
 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43
-#: dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78
+#: dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78
 #: dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2846,17 +2846,17 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57
 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176
 #: dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107
 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127
-#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406
+#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412
 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446
 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109
 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364
 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111
 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131
-#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438
+#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439
 #: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434
 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
@@ -3598,18 +3598,18 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178
 #: dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109
 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306
-#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132
+#: dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132
 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179
 #: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429
 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366
 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67
 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106
 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64
-#: dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165
+#: dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165
 #: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67
 #: dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
@@ -5828,7 +5828,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -6011,12 +6012,15 @@ msgstr ""
 #. type: textblock
 #: dh_installdeb:203
 msgid ""
-"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 # type: textblock
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 8e314187..d03fc5b0 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\n"
 "PO-Revision-Date: 2019-01-18 13:58+0100\n"
 "Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2817,19 +2817,19 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217
 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97
 #: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242
 #: dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75
 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302
-#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128
+#: dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128
 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175
 #: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425
 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53
 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63
 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102
 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60
-#: dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161
+#: dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161
 #: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63
 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
@@ -2862,19 +2862,19 @@ msgstr "Le site internet de debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61
 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141
 #: dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170
 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356
 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84
-#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134
+#: dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134
 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181
 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93
 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368
 #: dh_installmanpages:204 dh_installmenu:96 dh_installmime:69
 #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108
 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68
-#: dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167
+#: dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167
 #: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69
 #: dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
@@ -2882,17 +2882,17 @@ msgstr "AUTEUR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63
 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182
 #: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215
-#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412
+#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418
 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452
 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80
 #: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61
 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71
 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110
 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43
-#: dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78
+#: dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78
 #: dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -3104,17 +3104,17 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57
 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176
 #: dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107
 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127
-#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406
+#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412
 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446
 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109
 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364
 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111
 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131
-#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438
+#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439
 #: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434
 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
@@ -3900,18 +3900,18 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178
 #: dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109
 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306
-#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132
+#: dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132
 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179
 #: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429
 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366
 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67
 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106
 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64
-#: dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165
+#: dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165
 #: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67
 #: dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
@@ -6209,7 +6209,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -6392,12 +6393,15 @@ msgstr ""
 #. type: textblock
 #: dh_installdeb:203
 msgid ""
-"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 # type: textblock
diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po
index e4a69796..09f4ebe6 100644
--- a/man/po4a/po/ja.po
+++ b/man/po4a/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20141107\n"
-"POT-Creation-Date: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\n"
 "PO-Revision-Date: 2016-09-17 20:45+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
@@ -2506,19 +2506,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217
 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97
 #: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242
 #: dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75
 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302
-#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128
+#: dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128
 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175
 #: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425
 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53
 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63
 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102
 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60
-#: dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161
+#: dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161
 #: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63
 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
@@ -2546,36 +2546,36 @@ msgid "Debhelper web site."
 msgstr "Debhelper の Web サイトです。"
 
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61
 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141
 #: dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170
 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356
 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84
-#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134
+#: dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134
 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181
 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93
 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368
 #: dh_installmanpages:204 dh_installmenu:96 dh_installmime:69
 #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108
 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68
-#: dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167
+#: dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167
 #: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69
 #: dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63
 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182
 #: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215
-#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412
+#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418
 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452
 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80
 #: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61
 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71
 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110
 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43
-#: dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78
+#: dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78
 #: dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2764,17 +2764,17 @@ msgstr ""
 "ようになりました。"
 
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57
 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176
 #: dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107
 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127
-#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406
+#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412
 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446
 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109
 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364
 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111
 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131
-#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438
+#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439
 #: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434
 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
@@ -3518,18 +3518,18 @@ msgstr ""
 "れ、アーキテクチャ依存パッケージにのみ確実に作用するように動作します。 "
 
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178
 #: dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109
 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306
-#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132
+#: dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132
 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179
 #: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429
 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366
 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67
 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106
 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64
-#: dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165
+#: dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165
 #: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67
 #: dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
@@ -5570,7 +5570,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -5752,12 +5753,15 @@ msgstr ""
 #. type: textblock
 #: dh_installdeb:203
 msgid ""
-"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 #. type: textblock
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index 248fcdc6..eadeb3a2 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 12.1.1\n"
 "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n"
-"POT-Creation-Date: 2019-08-17 10:13+0000\n"
+"POT-Creation-Date: 2019-08-17 15:06+0000\n"
 "PO-Revision-Date: 2019-04-18 22:49+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -2674,19 +2674,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1205
+#: debhelper.pod:1184 debhelper-obsolete-compat.pod:118 dh:1217
 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97
 #: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:174 dh_clean:186 dh_compress:242
 #: dh_dwz:161 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75
 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302
-#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128
+#: dh_installcron:78 dh_installdeb:410 dh_installdebconf:128 dh_installdirs:128
 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175
 #: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425
 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53
 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63
 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102
 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60
-#: dh_listpackages:35 dh_makeshlibs:436 dh_md5sums:117 dh_movefiles:161
+#: dh_listpackages:35 dh_makeshlibs:437 dh_md5sums:117 dh_movefiles:161
 #: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:432 dh_testdir:63
 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280
 msgid "SEE ALSO"
@@ -2713,36 +2713,36 @@ msgid "Debhelper web site."
 msgstr "Sítio web do debhelper."
 
 #. type: =head1
-#: debhelper.pod:1198 dh:1211 dh_auto_build:59 dh_auto_clean:61
+#: debhelper.pod:1198 dh:1223 dh_auto_build:59 dh_auto_clean:61
 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141
 #: dh_builddeb:180 dh_clean:192 dh_compress:248 dh_dwz:167 dh_fixperms:170
 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356
 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84
-#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134
+#: dh_installdeb:416 dh_installdebconf:134 dh_installdirs:134
 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181
 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93
 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368
 #: dh_installmanpages:204 dh_installmenu:96 dh_installmime:69
 #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108
 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68
-#: dh_listpackages:41 dh_makeshlibs:442 dh_md5sums:123 dh_movefiles:167
+#: dh_listpackages:41 dh_makeshlibs:443 dh_md5sums:123 dh_movefiles:167
 #: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:438 dh_testdir:69
 #: dh_testroot:97 dh_usrlocal:142
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:1200 dh:1213 dh_auto_build:61 dh_auto_clean:63
+#: debhelper.pod:1200 dh:1225 dh_auto_build:61 dh_auto_clean:63
 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:182
 #: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215
-#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412
+#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:418
 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452
 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80
 #: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61
 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71
 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110
 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43
-#: dh_makeshlibs:444 dh_md5sums:125 dh_movefiles:169 dh_prep:78
+#: dh_makeshlibs:445 dh_md5sums:125 dh_movefiles:169 dh_prep:78
 #: dh_shlibdeps:212 dh_strip:440 dh_testdir:71 dh_testroot:99
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2934,17 +2934,17 @@ msgstr ""
 "B<dh_install> resulta em erro se as \"wildcards\" expandirem para nada."
 
 #. type: textblock
-#: debhelper-obsolete-compat.pod:120 dh:1207 dh_auto_build:55 dh_auto_clean:57
+#: debhelper-obsolete-compat.pod:120 dh:1219 dh_auto_build:55 dh_auto_clean:57
 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:176
 #: dh_clean:188 dh_compress:244 dh_dwz:163 dh_fixperms:166 dh_gconf:107
 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127
-#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406
+#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:412
 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446
 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109
 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364
 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111
 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131
-#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:438
+#: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:439
 #: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:434
 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282
 msgid "L<debhelper(7)>"
@@ -3682,18 +3682,18 @@ msgstr ""
 "assegurar que eles apenas trabalham em pacotes dependentes da arquitectura."
 
 #. type: textblock
-#: dh:1209 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
+#: dh:1221 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62
 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:178
 #: dh_clean:190 dh_compress:246 dh_dwz:165 dh_fixperms:168 dh_gconf:109
 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306
-#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132
+#: dh_installcron:82 dh_installdeb:414 dh_installdebconf:132 dh_installdirs:132
 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179
 #: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429
 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366
 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67
 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106
 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64
-#: dh_listpackages:39 dh_makeshlibs:440 dh_md5sums:121 dh_movefiles:165
+#: dh_listpackages:39 dh_makeshlibs:441 dh_md5sums:121 dh_movefiles:165
 #: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:436 dh_testdir:67
 #: dh_testroot:95 dh_usrlocal:140
 msgid "This program is a part of debhelper."
@@ -5769,7 +5769,8 @@ msgstr ""
 msgid ""
 "Define tokens to be replaced inside the maintainer scripts when it is "
 "generated.  Please note that the limitations described in L</Limitations in "
-"token names> also applies to tokens defined on the command line."
+"token names> also applies to tokens defined on the command line.  Invalid "
+"token names will trigger an error."
 msgstr ""
 
 #. type: textblock
@@ -5951,12 +5952,15 @@ msgstr ""
 #. type: textblock
 #: dh_installdeb:203
 msgid ""
-"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#"
+"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+#"
 msgstr ""
 
 #. type: textblock
 #: dh_installdeb:205
-msgid "Tokens that do not match that regex will be silently ignored."
+msgid ""
+"Tokens that do not match that regex will be silently ignored if found in the "
+"script template.  Invalid token names passed to B<-D> or B<--define> will "
+"cause B<dh_installdeb> to reject the command with an error in most cases."
 msgstr ""
 
 #. type: textblock