i18n-commit - autogenerated

10 files changed, 143 insertions, 137 deletions

diff --git a/po4a/dgit-downstream-dsc_7.pot b/po4a/dgit-downstream-dsc_7.pot
index 3bf1687..d13ce20 100644
--- a/po4a/dgit-downstream-dsc_7.pot
+++ b/po4a/dgit-downstream-dsc_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,29 +27,29 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150
 #, no-wrap
 msgid "CONFIGURATION"
 msgstr ""
 
 #. type: =item
-#: ../dgit.1:1198 ../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286
 #, no-wrap
 msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
 msgstr ""
 
 #. type: =item
-#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.upload-host>"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -241,9 +241,9 @@ msgid ""
 "B<dgit-repos-server> and B<dgit-repos-policy-debian> in the package B<dgit-"
 "infrastructure>.  but in most installations this is not needed.  If there is "
 "no or little distinction between (i) developers who are entitled to upload "
-"(push) and (ii) repository administrators, then a it is sufficient to "
-"provide a git server with a unix account for each user who will pushing, "
-"perhaps using ssh restricted commands."
+"(push) and (ii) repository administrators, then it is sufficient to provide "
+"a git server with a unix account for each user who will be pushing, perhaps "
+"using ssh restricted commands."
 msgstr ""
 
 #. type: =item
@@ -407,7 +407,7 @@ msgstr ""
 #: ../dgit-downstream-dsc.7.pod:217
 msgid ""
 "If you always have a git repository for every package in your archive, "
-"perhaps because you never use dput/dupload, and always dgit push, Set C<git-"
+"perhaps because you never use dput/dupload, and always dgit push, set C<git-"
 "check> to B<true>."
 msgstr ""
 
@@ -564,8 +564,9 @@ msgstr ""
 #. type: textblock
 #: ../dgit-downstream-dsc.7.pod:315
 msgid ""
-"To make ssh restricted command easier, and for the benefit of dgit-repos-"
-"server, dgit's ssh commands each start with a parseable commentish rune."
+"To make use of ssh restricted command easier, and for the benefit of dgit-"
+"repos-server, dgit's ssh commands each start with a parseable commentish "
+"rune."
 msgstr ""
 
 #. type: textblock
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot
index b937feb..71969f4 100644
--- a/po4a/dgit-maint-debrebase_7.pot
+++ b/po4a/dgit-maint-debrebase_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-06 17:50+0000\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,7 +27,7 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
@@ -695,8 +695,8 @@ msgstr ""
 #: ../dgit-maint-debrebase.7.pod:378
 msgid ""
 "Pass I<--stat> just to see the list of changed files, which is useful to "
-"determine whether there are any new or deleted files to may need accounting "
-"for in your copyright file."
+"determine whether there are any new or deleted files that may need "
+"accounting for in your copyright file."
 msgstr ""
 
 #. type: =head1
@@ -815,7 +815,7 @@ msgid ""
 "last upload, it is not possible for dgit to make your history fast-"
 "forwarding from the history on B<dgit-repos>.  In such cases you will have "
 "to pass I<--overwrite> to dgit.  git-debrebase will normally tell you if "
-"this is will be needed."
+"this will be needed."
 msgstr ""
 
 #. type: textblock
@@ -983,7 +983,7 @@ msgstr ""
 #. type: textblock
 #: ../dgit-maint-debrebase.7.pod:562
 msgid ""
-"If that fails, because your branch and the NMUers work represent divergent "
+"If that fails, because your branch and the NMUers' work represent divergent "
 "branches of development, you have a number of options.  Here we describe the "
 "two simplest."
 msgstr ""
diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot
index da22681..43d7d51 100644
--- a/po4a/dgit-maint-native_7.pot
+++ b/po4a/dgit-maint-native_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,11 +27,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -163,7 +163,7 @@ msgstr ""
 #: ../dgit-maint-native.7.pod:85
 msgid ""
 "Alternatively, if this was the first ever dgit push of the package, you can "
-"avoid this merge commit by passing C<--deliberately-not-fast-forward>.  "
+"avoid this merge commit by passing C<--deliberately-not-fast-forward> "
 "instead of C<--overwrite>.  This avoids introducing a new origin commit into "
 "your git history."
 msgstr ""
diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot
index 16d8859..08bc8f7 100644
--- a/po4a/dgit-sponsorship_7.pot
+++ b/po4a/dgit-sponsorship_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-13 20:41+0100\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,11 +27,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -65,9 +65,9 @@ msgstr ""
 #. type: textblock
 #: ../dgit-sponsorship.7.pod:12
 msgid ""
-"The sponsor must to be intending to use dgit for the upload.  (If the "
-"sponsor does not use dgit, it is not possible to properly publish a "
-"sponsee's git branch.)"
+"The sponsor must be intending to use dgit for the upload.  (If the sponsor "
+"does not use dgit, it is not possible to properly publish a sponsee's git "
+"branch.)"
 msgstr ""
 
 #. type: textblock
diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po
index 15166a7..fc13cf5 100644
--- a/po4a/dgit-user_7.nl.po
+++ b/po4a/dgit-user_7.nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dgit-user_7\n"
-"POT-Creation-Date: 2019-01-06 17:14+0000\n"
+"POT-Creation-Date: 2019-03-01 16:59+0000\n"
 "PO-Revision-Date: 2018-11-14 21:22+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgid "NAME"
 msgstr "NAAM"
 
 #. type: =head1
-#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
@@ -801,10 +801,17 @@ msgstr ""
 
 #. type: textblock
 #: ../dgit-user.7.pod:378
+#, fuzzy
+#| msgid ""
+#| "If neither of those are an option, your desperate last resort is to try "
+#| "using the same version number as the official package for your own "
+#| "package.  (The version is controlled by C<debian/changelog> - see "
+#| "above).  This is not ideal because it makes it hard to tell what is "
+#| "installed, and because it will mislead and confuse apt."
 msgid ""
 "If neither of those are an option, your desperate last resort is to try "
 "using the same version number as the official package for your own package.  "
-"(The version is controlled by C<debian/changelog> - see above).  This is not "
+"(The version is controlled by C<debian/changelog> - see above.)  This is not "
 "ideal because it makes it hard to tell what is installed, and because it "
 "will mislead and confuse apt."
 msgstr ""
diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot
index 5426aef..d5a8fef 100644
--- a/po4a/dgit-user_7.pot
+++ b/po4a/dgit-user_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-06 17:14+0000\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,7 +27,7 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
@@ -602,7 +602,7 @@ msgstr ""
 msgid ""
 "If neither of those are an option, your desperate last resort is to try "
 "using the same version number as the official package for your own package.  "
-"(The version is controlled by C<debian/changelog> - see above).  This is not "
+"(The version is controlled by C<debian/changelog> - see above.)  This is not "
 "ideal because it makes it hard to tell what is installed, and because it "
 "will mislead and confuse apt."
 msgstr ""
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot
index 97cbcd7..052904f 100644
--- a/po4a/dgit_1.pot
+++ b/po4a/dgit_1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-06 17:50+0000\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -738,7 +738,7 @@ msgstr ""
 msgid ""
 "Set up the working tree's B<.git/info/attributes> to disable all "
 "transforming attributes for all files.  This is done by defining a macro "
-"attribute B<dgit-defuse-attrs> and applying it to B<*>.  For why, see "
+"attribute, B<dgit-defuse-attrs,> and applying it to B<*>.  For why, see "
 "B<GITATTRIBUTES> in B<dgit(7)>.  Note that only attributes affecting the "
 "working tree are suppressed.  git-archive may remain exciting."
 msgstr ""
@@ -749,7 +749,7 @@ msgid ""
 "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ."
 "git/info/attributes, but it is insufficient, because it was made by an "
 "earlier version of dgit and git has since introduced new transforming "
-"attributes, modifies the macro to disable the newer transformations."
+"attributes, this modifies the macro to disable the newer transformations."
 msgstr ""
 
 #. type: Plain text
@@ -863,7 +863,7 @@ msgid ""
 "prefixed with B<..> then if it already exists and dgit actually imports the "
 "dsc (rather than simply reading the git commit out of the Dgit field), dgit "
 "will make a pseudomerge so that the result is necessarily fast forward from "
-"the existing branch.  Otherwise, if branch already exists, dgit will stop "
+"the existing branch.  Otherwise, if I<branch> already exists, dgit will stop "
 "with an error message."
 msgstr ""
 
@@ -1411,7 +1411,7 @@ msgid ""
 "override safety catches, including safety catches which relate to distro-"
 "specific policies.  The use of --deliberately is declared and published in "
 "the signed tags generated for you by dgit, so that the archive software can "
-"give effect to your intent, and for the benefit humans looking at the "
+"give effect to your intent, and for the benefit of humans looking at the "
 "history.  The meanings of I<something>s understood in the context of Debian "
 "are discussed below:"
 msgstr ""
@@ -1557,9 +1557,9 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.1:858
 msgid ""
-"Do not check whether up source format `3.0 (quilt)' metadata needs fixing "
-"up.  If you use this option and the metadata did in fact need fixing up, "
-"dgit push will fail."
+"Do not check whether source format `3.0 (quilt)' metadata needs fixing up.  "
+"If you use this option and the metadata did in fact need fixing up, dgit "
+"push will fail."
 msgstr ""
 
 #. type: TP
@@ -1668,7 +1668,7 @@ msgstr ""
 #: ../dgit.1:938
 msgid ""
 "Specifies the .changes file which is to be uploaded.  By default dgit push "
-"looks for single .changes file in the parent directory whose filename "
+"looks for a single .changes file in the parent directory whose filename "
 "suggests it is for the right package and version."
 msgstr ""
 
@@ -2281,9 +2281,9 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.1:1296
 msgid ""
-"Like .clean-mode, but ignored if the value does not make sense to this "
-"version of dgit.  Setting both .clean-mode and .clean-mode-newer is useful "
-"to provide a single git config compatible with different dgit versions."
+"Like .clean-mode, but ignored if the value is unknown to this version of "
+"dgit.  Setting both .clean-mode and .clean-mode-newer is useful to provide a "
+"single git config compatible with different dgit versions."
 msgstr ""
 
 #. type: TP
@@ -2390,7 +2390,7 @@ msgstr ""
 #: ../dgit.1:1332
 msgid ""
 "Whether to set user.name and user.email in new git trees.  True by default.  "
-"Ignored for dgit setup-setup-useremail, which does it anyway."
+"Ignored for dgit setup-useremail, which does it anyway."
 msgstr ""
 
 #. type: TP
@@ -2402,7 +2402,7 @@ msgstr ""
 #. type: Plain text
 #: ../dgit.1:1337
 msgid ""
-"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/"
+"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
 "changelog.  True by default.  Ignored for dgit setup-mergechangelogs, which "
 "does it anyway."
 msgstr ""
@@ -2439,23 +2439,23 @@ msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1360
+#: ../dgit.1:1361
 msgid ""
 "Extra options to pass to I<cmd>.  Works like B<-->I<cmd>B<:>... .  To pass "
 "several options, configure multiple values in git config (with git config --"
-"add).  The options for B<dgit.default.opts->I<cmd> B<dgit-distro."
-">I<distro>B</push.opts->I<cmd> and are all used, followed by options from "
-"dgit's command line."
+"add).  The options for B<dgit.default.opts->I<cmd> and B<dgit-distro."
+">I<distro>B</push.opts->I<cmd> are all used, followed by options from dgit's "
+"command line."
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1360
+#: ../dgit.1:1361
 #, no-wrap
 msgid "ACCESS CONFIGURATION"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1365
+#: ../dgit.1:1366
 msgid ""
 "There are many other settings which specify how a particular distro's "
 "services (archive and git) are provided.  These should not normally be "
@@ -2464,204 +2464,204 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1365
+#: ../dgit.1:1366
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1368
+#: ../dgit.1:1369
 msgid "Shown in git tags, Dgit fields, and so on."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1368
+#: ../dgit.1:1369
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1371
+#: ../dgit.1:1372
 msgid "Used for all access configuration lookup."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1371
+#: ../dgit.1:1372
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B</push.>*"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1377
+#: ../dgit.1:1378
 msgid ""
 "If set, overrides corresponding non B</push> config when B<readonly=false>, "
 "or when pushing and B<readonly=auto>."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1377
+#: ../dgit.1:1378
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-url>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1379
+#: ../dgit.1:1380
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1381
+#: ../dgit.1:1382
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-proto>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1383
+#: ../dgit.1:1384
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-path>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1385
+#: ../dgit.1:1386
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1387
+#: ../dgit.1:1388
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1389
+#: ../dgit.1:1390
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1391
+#: ../dgit.1:1392
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1393
+#: ../dgit.1:1394
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path>  | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1395
+#: ../dgit.1:1396
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1397
+#: ../dgit.1:1398
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1399
+#: ../dgit.1:1400
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1401
+#: ../dgit.1:1402
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1403
+#: ../dgit.1:1404
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1405
+#: ../dgit.1:1406
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.ssh>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1407
+#: ../dgit.1:1408
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1409
+#: ../dgit.1:1410
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1411
+#: ../dgit.1:1412
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1413
+#: ../dgit.1:1414
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1415
+#: ../dgit.1:1416
 #, no-wrap
 msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1417
+#: ../dgit.1:1418
 #, no-wrap
 msgid "B<dgit.default.old-dsc-distro>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1419
+#: ../dgit.1:1420
 #, no-wrap
 msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1421
+#: ../dgit.1:1422
 #, no-wrap
 msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1423
+#: ../dgit.1:1424
 #, no-wrap
 msgid "B<dgit.default.dsc-url-proto-ok>"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1425
+#: ../dgit.1:1426
 #, no-wrap
 msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1427
+#: ../dgit.1:1428
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1428
+#: ../dgit.1:1429
 #, no-wrap
 msgid "B<DGIT_SSH>, B<GIT_SSH>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1437
+#: ../dgit.1:1438
 msgid ""
 "specify an alternative default program (and perhaps arguments) to use "
 "instead of ssh.  DGIT_SSH is consulted first and may contain arguments; if "
@@ -2671,26 +2671,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1437
+#: ../dgit.1:1438
 #, no-wrap
 msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1441
+#: ../dgit.1:1442
 msgid ""
 "Default git user.email and user.name for new trees.  See B<dgit setup-new-"
 "tree>."
 msgstr ""
 
 #. type: TP
-#: ../dgit.1:1441
+#: ../dgit.1:1442
 #, no-wrap
 msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1446
+#: ../dgit.1:1447
 msgid ""
 "and other subprograms and modules used by dgit are affected by various "
 "environment variables.  Consult the documentation for those programs for "
@@ -2698,13 +2698,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ../dgit.1:1446
+#: ../dgit.1:1447
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1453
+#: ../dgit.1:1454
 msgid ""
 "There should be a `dgit rebase-prep' command or some such to turn a fast-"
 "forwarding branch containing pseudo-merges back into a rebasing patch "
@@ -2712,7 +2712,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1459
+#: ../dgit.1:1460
 msgid ""
 "If the dgit push fails halfway through, it is not necessarily restartable "
 "and idempotent.  It would be good to check that the proposed signing key is "
@@ -2720,7 +2720,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1464
+#: ../dgit.1:1465
 msgid ""
 "dgit's build functions, and dgit push, may make changes to your current "
 "HEAD.  Sadly this is necessary for packages in the `3.0 (quilt)' source "
@@ -2729,7 +2729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1469
+#: ../dgit.1:1470
 msgid ""
 "--dry-run does not always work properly, as not doing some of the git "
 "fetches may result in subsequent actions being different.  Doing a non-dry-"
@@ -2737,7 +2737,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
@@ -2748,13 +2748,13 @@ msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1478
+#: ../dgit.1:1479
 msgid ""
 "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-"
 "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1),"
 msgstr ""
 
 #. type: Plain text
-#: ../dgit.1:1479
+#: ../dgit.1:1480
 msgid "https://browse.dgit.debian.org/"
 msgstr ""
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot
index 78ed743..1329e77 100644
--- a/po4a/dgit_7.pot
+++ b/po4a/dgit_7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-13 20:41+0100\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -39,11 +39,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -292,7 +292,7 @@ msgstr ""
 #: ../dgit.7:166
 msgid ""
 "When using this facility, it is important to always specify the same suites "
-"in the same order: dgit will not be make a coherent fast-forwarding history "
+"in the same order: dgit will not make a coherent fast-forwarding history "
 "view otherwise."
 msgstr ""
 
@@ -611,7 +611,7 @@ msgstr ""
 #: ../dgit.7:371
 msgid ""
 "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent "
-"edge which cannot be sensibly be either ignored, or turned into a patch in "
+"edge which cannot sensibly be either ignored, or turned into a patch in "
 "debian/patches.  In this example, this is because it itself changes files in "
 "debian/patches, indicating that something unusual is going on and that "
 "continuing is not safe.  But you might also see other kinds of troublesome "
diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot
index 630039b..0697082 100644
--- a/po4a/git-debrebase_1.pot
+++ b/po4a/git-debrebase_1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-06 17:50+0000\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -33,7 +33,7 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
@@ -88,7 +88,7 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.1.pod:22
 msgid ""
-"You should read this manpage in cojnunction with L<git-debrebase(5)/"
+"You should read this manpage in conjunction with L<git-debrebase(5)/"
 "TERMINOLOGY>, which defines many important terms used here."
 msgstr ""
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid ""
 "It is hazardous to use plain git-rebase on a git-debrebase branch, because "
 "git-rebase has a tendency to start the rebase too far back in history, and "
-"then drop important commits.  Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>"
+"then drop important commits.  See L<git-debrebase(5)/ILLEGAL OPERATIONS>"
 msgstr ""
 
 #. type: =item
@@ -325,7 +325,7 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.1.pod:157
 msgid ""
-"<new-version> may be whole new Debian version, including revision, or just "
+"<new-version> may be a whole new Debian version, including revision, or just "
 "the upstream part, in which case -1 will be appended to make the new Debian "
 "version."
 msgstr ""
@@ -461,7 +461,7 @@ msgstr ""
 msgid ""
 "If the patches implied by the current branch are not a simple superset of "
 "those already in debian/patches, make-patches will fail with exit status 7, "
-"and an error message.  (The message can be suppress with --quiet-would-"
+"and an error message.  (The message can be suppressed with --quiet-would-"
 "amend.)  If the problem is simply that the existing patches were not made by "
 "git-debrebase, using dgit quilt-fixup instead should succeed."
 msgstr ""
@@ -478,7 +478,7 @@ msgstr ""
 
 #. type: textblock
 #: ../git-debrebase.1.pod:261
-msgid "Cnnverts any of the following into a git-debrebase interchange branch:"
+msgid "Converts any of the following into a git-debrebase interchange branch:"
 msgstr ""
 
 #. type: textblock
@@ -651,7 +651,7 @@ msgstr ""
 #: ../git-debrebase.1.pod:371
 msgid ""
 "This is provided mostly for the test suite and for unusual situations.  It "
-"should only be used with a care and with a proper understanding of the "
+"should only be used with care and with a proper understanding of the "
 "underlying theory."
 msgstr ""
 
diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot
index f5c7df7..71601b1 100644
--- a/po4a/git-debrebase_5.pot
+++ b/po4a/git-debrebase_5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-03-01 16:59+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"
@@ -27,11 +27,11 @@ msgid "NAME"
 msgstr ""
 
 #. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
+#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
 #: ../git-debrebase.5.pod:678
 #, no-wrap
 msgid "SEE ALSO"
@@ -312,7 +312,7 @@ msgstr ""
 #: ../git-debrebase.5.pod:147
 msgid ""
 "git-debrebase has one primary branch, the B<interchange branch>.  This "
-"branch is found on Debian contributor's workstations (typically, a "
+"branch is found on Debian contributors' workstations (typically, a "
 "maintainer would call it B<master>), in the Debian dgit git server as the "
 "suite branch (B<dgit/dgit/sid>)  and on other git servers which support "
 "Debian work (eg B<master> on salsa)."
@@ -349,7 +349,7 @@ msgid ""
 "C<debian/> directory that may be in the upstream commits).  The breakwater "
 "does not contain any representation of the delta queue (not even debian/"
 "patches).  The part of the breakwater processed by git-debrebase is the part "
-"since the most reecent B<anchor>, which is usually a special merge generated "
+"since the most recent B<anchor>, which is usually a special merge generated "
 "by git-debrebase."
 msgstr ""
 
@@ -446,8 +446,7 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.5.pod:257
 msgid ""
-"Zero or more single-parent commits contaioning only changes to upstream "
-"files."
+"Zero or more single-parent commits containing only changes to upstream files."
 msgstr ""
 
 #. type: textblock
@@ -455,8 +454,7 @@ msgstr ""
 msgid ""
 "The merely B<unstitched> (ie, unstitched but unlaundered)  branch state is "
 "also B<rebasing>.  It has the same contents as the laundered state, except "
-"that it may contain, additionally, in B<in any order but after the "
-"breakwater>:"
+"that it may contain, additionally, B<in any order but after the breakwater>:"
 msgstr ""
 
 #. type: =item
@@ -601,8 +599,8 @@ msgstr ""
 msgid ""
 "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
 "of refs/B, (usually, the result of last stitch).  This is used for status "
-"printing and some error error checks - especially for printing guesses what "
-"a problem is.  To determine whether a branch is is being maintained in git-"
+"printing and some error error checks - especially for printing guesses about "
+"what a problem is.  To determine whether a branch is being maintained in git-"
 "debrebase form it is necessary to walk its history."
 msgstr ""
 
@@ -666,7 +664,7 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.5.pod:422
 msgid ""
-"The following basic operations follows from this model (refer to the diagram "
+"The following basic operations follow from this model (refer to the diagram "
 "above):"
 msgstr ""
 
@@ -762,11 +760,11 @@ msgstr ""
 #. type: textblock
 #: ../git-debrebase.5.pod:474
 msgid ""
-"Make a pseudomerge, whose contributing parent to is the unstitched branch "
-"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
-"(and writing debrebase-last instead).  Ideally the contributing parent would "
-"be a laundered branch, or perhaps a laundered branch with a quilt patch "
-"addition commit."
+"Make a pseudomerge, whose contributing parent is the unstitched branch and "
+"whose overwritten parent is ffq-prev, consuming ffq-prev in the process (and "
+"writing debrebase-last instead).  Ideally the contributing parent would be a "
+"laundered branch, or perhaps a laundered branch with a quilt patch addition "
+"commit."
 msgstr ""
 
 #. type: =item
@@ -778,7 +776,7 @@ msgstr ""
 #: ../git-debrebase.5.pod:485
 msgid ""
 "To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
-"packages, the delta queue must be reified inside the git tree in B<debian/"
+"package, the delta queue must be reified inside the git tree in B<debian/"
 "patches/>.  These patch files can be stripped out and/or regenerated as "
 "needed."
 msgstr ""
@@ -827,7 +825,7 @@ msgstr ""
 #: ../git-debrebase.5.pod:514
 msgid ""
 "For these reasons, it is better to use git-debrebase and let it choose the "
-"base for your rebase.  If you do realise you have make this mistake, it is "
+"base for your rebase.  If you do realise you have made this mistake, it is "
 "best to use the reflog to recover to a suitable good previous state."
 msgstr ""