1 files changed, 33 insertions, 26 deletions
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 6c637f6e..38662686 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: 2013-05-18 10:54-0400\n"
+"POT-Creation-Date: 2013-06-04 11:27-0400\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"
@@ -374,7 +374,7 @@ msgid "Do not modify F<postinst>, F<postrm>, etc. scripts."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:68 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:678 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:208 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:333 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:319 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
+#: debhelper.pod:678 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:208 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:238 dh_installcron:79 dh_installdeb:140 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:333 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:319 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:175 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
 msgid "SEE ALSO"
 msgstr ""
 
@@ -1210,12 +1210,12 @@ msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:692 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:214 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:339 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
+#: debhelper.pod:692 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:214 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:244 dh_installcron:85 dh_installdeb:146 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:339 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:694 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:216 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:148 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:341 dh_installemacsen:134 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:327 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
+#: debhelper.pod:694 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:216 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:246 dh_installcron:87 dh_installdeb:148 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:341 dh_installemacsen:134 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:327 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -1273,7 +1273,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
+#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -1739,12 +1739,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:210 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:335 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:321 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_python:282 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
+#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:210 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:240 dh_installcron:81 dh_installdeb:142 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:335 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:321 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_python:282 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:212 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:337 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:323 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
+#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:212 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:242 dh_installcron:83 dh_installdeb:144 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:337 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:323 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -2029,7 +2029,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:32 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:29 dh_movefiles:26
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:29 dh_movefiles:26
 msgid "FILES"
 msgstr ""
 
@@ -2215,7 +2215,7 @@ msgid "Can list other files to be removed."
 msgstr ""
 
 #. type: =item
-#: dh_clean:45 dh_installchangelogs:60
+#: dh_clean:45 dh_installchangelogs:63
 msgid "B<-k>, B<--keep>"
 msgstr ""
 
@@ -2875,49 +2875,56 @@ msgstr ""
 #: dh_installchangelogs:25
 msgid ""
 "If there is an upstream F<changelog> file, it will be be installed as "
-"F<usr/share/doc/package/changelog> in the package build directory. If the "
-"changelog is a F<html> file (determined by file extension), it will be "
-"installed as F<usr/share/doc/package/changelog.html> instead, and will be "
-"converted to plain text with B<html2text> to generate "
-"F<usr/share/doc/package/changelog>."
+"F<usr/share/doc/package/changelog> in the package build directory."
+msgstr ""
+
+#. type: textblock
+#: dh_installchangelogs:28
+msgid ""
+"If the upstream changelog is is a F<html> file (determined by file "
+"extension), it will be installed as F<usr/share/doc/package/changelog.html> "
+"instead. If the html changelog is converted to plain text, that variant can "
+"be specified as a second upstream changelog file. When no plain text variant "
+"is specified, a short F<usr/share/doc/package/changelog> is generated, "
+"pointing readers at the html changelog file."
 msgstr ""
 
 #. type: =item
-#: dh_installchangelogs:36
+#: dh_installchangelogs:39
 msgid "F<debian/changelog>"
 msgstr ""
 
 #. type: =item
-#: dh_installchangelogs:38
+#: dh_installchangelogs:41
 msgid "F<debian/NEWS>"
 msgstr ""
 
 #. type: =item
-#: dh_installchangelogs:40
+#: dh_installchangelogs:43
 msgid "debian/I<package>.changelog"
 msgstr ""
 
 #. type: =item
-#: dh_installchangelogs:42
+#: dh_installchangelogs:45
 msgid "debian/I<package>.NEWS"
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:44
+#: dh_installchangelogs:47
 msgid ""
 "Automatically installed into usr/share/doc/I<package>/ in the package build "
 "directory."
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:47
+#: dh_installchangelogs:50
 msgid ""
 "Use the package specific name if I<package> needs a different F<NEWS> or "
 "F<changelog> file."
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:50
+#: dh_installchangelogs:53
 msgid ""
 "The F<changelog> file is installed with a name of changelog for native "
 "packages, and F<changelog.Debian> for non-native packages.  The F<NEWS> file "
@@ -2925,7 +2932,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:62
+#: dh_installchangelogs:65
 msgid ""
 "Keep the original name of the upstream changelog. This will be accomplished "
 "by installing the upstream changelog as F<changelog>, and making a symlink "
@@ -2935,19 +2942,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:70
+#: dh_installchangelogs:73
 msgid ""
 "Exclude upstream F<changelog> files that contain I<item> anywhere in their "
 "filename from being installed."
 msgstr ""
 
 #. type: =item
-#: dh_installchangelogs:73
+#: dh_installchangelogs:76
 msgid "I<upstream>"
 msgstr ""
 
 #. type: textblock
-#: dh_installchangelogs:75
+#: dh_installchangelogs:78
 msgid "Install this file as the upstream changelog."
 msgstr ""