X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=po%2Fen_US.po;h=cd157b5b1518154a1bce8f7539a8949483373abf;hb=66e7cb5758160a04d63831dc7dd19e0d55816650;hp=bd4bc79e16e0d58e8f5838c90e8e0d565cb1254a;hpb=11d37018478b444892c38cf072b3ddd07256793a;p=dgit.git

diff --git a/po/en_US.po b/po/en_US.po
index bd4bc79e..cd157b5b 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dgit ongoing\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-10 18:42+0000\n"
+"POT-Creation-Date: 2019-09-06 22:47+0000\n"
 "PO-Revision-Date: 2018-08-26 16:55+0100\n"
 "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n"
 "Language-Team: dgit developrs <dgit@packages.debian.org>\n"
@@ -17,73 +17,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dgit:265
+#: ../dgit:267
 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 
-#: ../dgit:272
+#: ../dgit:274
 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 
-#: ../dgit:280
+#: ../dgit:282
 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 
-#: ../dgit:285
+#: ../dgit:287
 #, perl-format
 msgid "%s: source package %s does not exist in suite %s\n"
 msgstr ""
 
-#: ../dgit:517
+#: ../dgit:519
 #, perl-format
 msgid "build host child %s"
 msgstr ""
 
-#: ../dgit:522 ../dgit:528
+#: ../dgit:524 ../dgit:530
 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 
-#: ../dgit:523
+#: ../dgit:525
 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 
-#: ../dgit:531
+#: ../dgit:533
 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 
-#: ../dgit:538
+#: ../dgit:540
 msgid "protocol message"
 msgstr ""
 
-#: ../dgit:546
+#: ../dgit:548
 #, perl-format
 msgid "`%s'"
 msgstr ""
 
-#: ../dgit:567
+#: ../dgit:569
 msgid "bad byte count"
 msgstr ""
 
-#: ../dgit:570
+#: ../dgit:572
 msgid "data block"
 msgstr ""
 
-#: ../dgit:649
+#: ../dgit:651
 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 
-#: ../dgit:651
+#: ../dgit:653
 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 
-#: ../dgit:676
+#: ../dgit:678
 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -104,147 +104,147 @@ msgid ""
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 
-#: ../dgit:695
+#: ../dgit:697
 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 
-#: ../dgit:699
+#: ../dgit:701
 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 
-#: ../dgit:704
+#: ../dgit:706
 msgid "too few arguments"
 msgstr ""
 
-#: ../dgit:820
+#: ../dgit:822
 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 
-#: ../dgit:823
+#: ../dgit:825
 #, perl-format
 msgid "value for config option %s (in %s git config) contains newline(s)!"
 msgstr ""
 
-#: ../dgit:843
+#: ../dgit:845
 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 
-#: ../dgit:884
+#: ../dgit:902
 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 
-#: ../dgit:899
+#: ../dgit:917
 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 
-#: ../dgit:915
+#: ../dgit:933
 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 
-#: ../dgit:935
+#: ../dgit:953
 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 
-#: ../dgit:953
+#: ../dgit:971
 #, perl-format
 msgid "unknown %s `%s'"
 msgstr ""
 
-#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209
+#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211
 msgid "internal error"
 msgstr ""
 
-#: ../dgit:960
+#: ../dgit:978
 msgid "pushing but distro is configured readonly"
 msgstr ""
 
-#: ../dgit:964
+#: ../dgit:982
 msgid ""
 "Push failed, before we got started.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
-#: ../dgit:987
+#: ../dgit:1005
 #, perl-format
 msgid ""
 "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
 "set to `%s'"
 msgstr ""
 
-#: ../dgit:1150
+#: ../dgit:1168
 msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 
-#: ../dgit:1217
+#: ../dgit:1236
 #, perl-format
 msgid "fetch of %s failed (%s): %s"
 msgstr ""
 
-#: ../dgit:1224
+#: ../dgit:1243
 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 
-#: ../dgit:1245
+#: ../dgit:1264
 msgid "ftpmasterapi archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1263
+#: ../dgit:1282
 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 
-#: ../dgit:1267
+#: ../dgit:1286
 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 
-#: ../dgit:1269
+#: ../dgit:1288
 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 
-#: ../dgit:1271
+#: ../dgit:1290
 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 
-#: ../dgit:1273 ../dgit:1298
+#: ../dgit:1292 ../dgit:1317
 msgid "bad ftpmaster api response: "
 msgstr ""
 
-#: ../dgit:1287
+#: ../dgit:1306
 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 
-#: ../dgit:1289
+#: ../dgit:1308
 msgid "bad component"
 msgstr ""
 
-#: ../dgit:1292
+#: ../dgit:1311
 msgid "bad filename"
 msgstr ""
 
-#: ../dgit:1294
+#: ../dgit:1313
 msgid "bad sha256sum"
 msgstr ""
 
-#: ../dgit:1345
+#: ../dgit:1364
 msgid "aptget archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1429
+#: ../dgit:1448
 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -252,159 +252,159 @@ msgid ""
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 
-#: ../dgit:1453
+#: ../dgit:1472
 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 
-#: ../dgit:1479
+#: ../dgit:1498
 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 
-#: ../dgit:1480
+#: ../dgit:1499
 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 
-#: ../dgit:1585
+#: ../dgit:1604
 #, perl-format
 msgid ""
 "unable to canonicalise suite using package %s which does not appear to exist "
 "in suite %s; --existing-package may help"
 msgstr ""
 
-#: ../dgit:1724
+#: ../dgit:1743
 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 
-#: ../dgit:1727
+#: ../dgit:1746
 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 
-#: ../dgit:1729
+#: ../dgit:1748
 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 
-#: ../dgit:1749
+#: ../dgit:1768
 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 
-#: ../dgit:1755
+#: ../dgit:1774
 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 
-#: ../dgit:1782
+#: ../dgit:1801
 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 
-#: ../dgit:1805
+#: ../dgit:1824
 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 
-#: ../dgit:1820
+#: ../dgit:1839
 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 
-#: ../dgit:1857
+#: ../dgit:1876
 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 
-#: ../dgit:1903
+#: ../dgit:1922
 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 
-#: ../dgit:1914
+#: ../dgit:1933
 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 
-#: ../dgit:1960
+#: ../dgit:1979
 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 
-#: ../dgit:1969
+#: ../dgit:1988
 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 
-#: ../dgit:1973
+#: ../dgit:1992
 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 
-#: ../dgit:1979
+#: ../dgit:1998
 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 
-#: ../dgit:2019
+#: ../dgit:2038
 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 
-#: ../dgit:2032
+#: ../dgit:2051
 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 
-#: ../dgit:2045
+#: ../dgit:2064
 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 
-#: ../dgit:2061
+#: ../dgit:2080
 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 
-#: ../dgit:2066
+#: ../dgit:2085
 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 
-#: ../dgit:2074
+#: ../dgit:2093
 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 
-#: ../dgit:2081
+#: ../dgit:2100
 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 
-#: ../dgit:2109
+#: ../dgit:2128
 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 
-#: ../dgit:2117
+#: ../dgit:2136
 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 
-#: ../dgit:2120
+#: ../dgit:2139
 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 
-#: ../dgit:2139
+#: ../dgit:2158
 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 
-#: ../dgit:2162
+#: ../dgit:2181
 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -419,108 +419,108 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:2174
+#: ../dgit:2193
 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 
-#: ../dgit:2205
+#: ../dgit:2224
 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 
-#: ../dgit:2207
+#: ../dgit:2226
 msgid "(base) distro being accessed"
 msgstr ""
 
-#: ../dgit:2209
+#: ../dgit:2228
 msgid "(nominal) distro being accessed"
 msgstr ""
 
-#: ../dgit:2214
+#: ../dgit:2233
 #, perl-format
 msgid "build-products-dir %s is not accessible: %s\n"
 msgstr ""
 
-#: ../dgit:2239
+#: ../dgit:2258
 #, perl-format
 msgid ""
 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
 msgstr ""
 
-#: ../dgit:2243
+#: ../dgit:2262
 #, perl-format
 msgid "check orig file %s in bpd %s: %s"
 msgstr ""
 
-#: ../dgit:2245
+#: ../dgit:2264
 #, perl-format
 msgid "check orig file %s in ..: %s"
 msgstr ""
 
-#: ../dgit:2248
+#: ../dgit:2267
 #, perl-format
 msgid "check target of orig symlink %s in ..: %s"
 msgstr ""
 
-#: ../dgit:2257
+#: ../dgit:2276
 #, perl-format
 msgid "%s: cloned orig symlink from ..: %s\n"
 msgstr ""
 
-#: ../dgit:2261
+#: ../dgit:2280
 #, perl-format
 msgid "%s: hardlinked orig from ..: %s\n"
 msgstr ""
 
-#: ../dgit:2264
+#: ../dgit:2283
 #, perl-format
 msgid "failed to make %s a hardlink to %s: %s"
 msgstr ""
 
-#: ../dgit:2270
+#: ../dgit:2289
 #, perl-format
 msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
 msgstr ""
 
-#: ../dgit:2341
+#: ../dgit:2360
 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 
-#: ../dgit:2403
+#: ../dgit:2422
 msgid "package changelog"
 msgstr ""
 
-#: ../dgit:2443
+#: ../dgit:2462
 msgid "package changelog has no entries!"
 msgstr ""
 
-#: ../dgit:2512 ../dgit:2517
+#: ../dgit:2531 ../dgit:2536
 #, perl-format
 msgid "accessing %s: %s"
 msgstr ""
 
-#: ../dgit:2532 ../dgit:2539
+#: ../dgit:2551 ../dgit:2558
 #, perl-format
 msgid "saving %s: %s"
 msgstr ""
 
-#: ../dgit:2565 ../dgit:6037
+#: ../dgit:2584 ../dgit:6070
 msgid "source package"
 msgstr ""
 
-#: ../dgit:2643
+#: ../dgit:2662
 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 
-#: ../dgit:2662
+#: ../dgit:2681
 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: ../dgit:2671
+#: ../dgit:2690
 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"
@@ -529,16 +529,16 @@ msgid ""
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 
-#: ../dgit:2686
+#: ../dgit:2705
 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 
-#: ../dgit:2690
+#: ../dgit:2709
 msgid "Import of source package"
 msgstr ""
 
-#: ../dgit:2710
+#: ../dgit:2729
 #, perl-format
 msgid ""
 "\n"
@@ -547,51 +547,51 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:2752
+#: ../dgit:2771
 #, perl-format
 msgid "using existing %s"
 msgstr ""
 
-#: ../dgit:2756
+#: ../dgit:2775
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 
-#: ../dgit:2760
+#: ../dgit:2779
 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 
-#: ../dgit:2776
+#: ../dgit:2795
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 
-#: ../dgit:2871
+#: ../dgit:2890
 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 
-#: ../dgit:2886
+#: ../dgit:2905
 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 
-#: ../dgit:2930
+#: ../dgit:2949
 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 
-#: ../dgit:2945
+#: ../dgit:2964
 msgid ""
 "--dry-run specified but we actually wanted the results of git fetch,\n"
 "so this is not going to work.  Try running dgit fetch first,\n"
 "or using --damp-run instead of --dry-run.\n"
 msgstr ""
 
-#: ../dgit:2950
+#: ../dgit:2969
 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"
@@ -601,24 +601,24 @@ msgid ""
 "warning:  Will try again...\n"
 msgstr ""
 
-#: ../dgit:3097
+#: ../dgit:3116
 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 
-#: ../dgit:3102
+#: ../dgit:3121
 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 
-#: ../dgit:3107
+#: ../dgit:3126
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
 "for which we have no configured url and .dsc provides no hint\n"
 msgstr ""
 
-#: ../dgit:3117
+#: ../dgit:3136
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
@@ -627,54 +627,54 @@ msgid ""
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 
-#: ../dgit:3137
+#: ../dgit:3156
 msgid "rewrite map"
 msgstr ""
 
-#: ../dgit:3144
+#: ../dgit:3163
 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 
-#: ../dgit:3148
+#: ../dgit:3167
 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 
-#: ../dgit:3150
+#: ../dgit:3169
 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 
-#: ../dgit:3157
+#: ../dgit:3176
 msgid "additional commits"
 msgstr ""
 
-#: ../dgit:3160
+#: ../dgit:3179
 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 
-#: ../dgit:3185
+#: ../dgit:3204
 msgid "last upload to archive"
 msgstr ""
 
-#: ../dgit:3189
+#: ../dgit:3208
 msgid "no version available from the archive"
 msgstr ""
 
-#: ../dgit:3272
+#: ../dgit:3291
 msgid "dgit suite branch on dgit git server"
 msgstr ""
 
-#: ../dgit:3279
+#: ../dgit:3298
 msgid "dgit client's archive history view"
 msgstr ""
 
-#: ../dgit:3284
+#: ../dgit:3303
 msgid "Dgit field in .dsc from archive"
 msgstr ""
 
-#: ../dgit:3312
+#: ../dgit:3331
 #, perl-format
 msgid ""
 "\n"
@@ -684,15 +684,15 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3325
+#: ../dgit:3344
 msgid "archive .dsc names newer git commit"
 msgstr ""
 
-#: ../dgit:3328
+#: ../dgit:3347
 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 
-#: ../dgit:3349
+#: ../dgit:3368
 #, perl-format
 msgid ""
 "\n"
@@ -700,7 +700,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3358
+#: ../dgit:3377
 #, perl-format
 msgid ""
 "\n"
@@ -710,7 +710,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3443
+#: ../dgit:3462
 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"
@@ -718,19 +718,19 @@ msgid ""
 "Record that\n"
 msgstr ""
 
-#: ../dgit:3456
+#: ../dgit:3475
 msgid "should be treated as descended from\n"
 msgstr ""
 
-#: ../dgit:3474
+#: ../dgit:3493
 msgid "dgit repo server tip (last push)"
 msgstr ""
 
-#: ../dgit:3476
+#: ../dgit:3495
 msgid "local tracking tip (last fetch)"
 msgstr ""
 
-#: ../dgit:3487
+#: ../dgit:3506
 #, perl-format
 msgid ""
 "\n"
@@ -740,30 +740,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3502
+#: ../dgit:3521
 msgid "fetched source tree"
 msgstr ""
 
-#: ../dgit:3538
+#: ../dgit:3557
 msgid "debian/changelog merge driver"
 msgstr ""
 
-#: ../dgit:3603
+#: ../dgit:3622
 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 
-#: ../dgit:3617
+#: ../dgit:3636
 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 
-#: ../dgit:3632
+#: ../dgit:3651
 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 
-#: ../dgit:3659
+#: ../dgit:3678
 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"
@@ -771,30 +771,30 @@ msgid ""
 "tree.\n"
 msgstr ""
 
-#: ../dgit:3681
+#: ../dgit:3700
 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 
-#: ../dgit:3689
+#: ../dgit:3708
 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 
-#: ../dgit:3728
+#: ../dgit:3747
 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 
-#: ../dgit:3760
+#: ../dgit:3779
 msgid "local combined tracking branch"
 msgstr ""
 
-#: ../dgit:3762
+#: ../dgit:3781
 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 
-#: ../dgit:3801
+#: ../dgit:3820
 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"
@@ -802,7 +802,7 @@ msgid ""
 "Input branches:\n"
 msgstr ""
 
-#: ../dgit:3815
+#: ../dgit:3834
 msgid ""
 "\n"
 "Key\n"
@@ -811,257 +811,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3830
+#: ../dgit:3849
 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 
-#: ../dgit:3848
+#: ../dgit:3867
 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 
-#: ../dgit:3866
+#: ../dgit:3885
 msgid "dry run makes no sense with clone"
 msgstr ""
 
-#: ../dgit:3881
+#: ../dgit:3900
 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 
-#: ../dgit:3893
+#: ../dgit:3912
 msgid "fetching existing git history"
 msgstr ""
 
-#: ../dgit:3896
+#: ../dgit:3915
 msgid "starting new git history"
 msgstr ""
 
-#: ../dgit:3921
+#: ../dgit:3940
 #, perl-format
 msgid ""
 "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
 " Your vcs-git remote url may be out of date.  Use dgit update-vcs-git ?\n"
 msgstr ""
 
-#: ../dgit:3926
+#: ../dgit:3945
 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 
-#: ../dgit:3938
+#: ../dgit:3957
 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 
-#: ../dgit:3940
+#: ../dgit:3959
 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 
-#: ../dgit:3948
+#: ../dgit:3967
 #, perl-format
 msgid "git tree contains %s"
 msgstr ""
 
-#: ../dgit:3959
+#: ../dgit:3978
 msgid "you have uncommitted changes to critical files, cannot continue:\n"
 msgstr ""
 
-#: ../dgit:3978
+#: ../dgit:3997
 #, perl-format
 msgid ""
 "quilt fixup required but quilt mode is `nofix'\n"
 "HEAD commit%s differs from tree implied by debian/patches%s"
 msgstr ""
 
-#: ../dgit:3995
+#: ../dgit:4014
 msgid "nothing quilty to commit, ok."
 msgstr ""
 
-#: ../dgit:3998
+#: ../dgit:4017
 msgid " (wanted to commit patch update)"
 msgstr ""
 
-#: ../dgit:4002
+#: ../dgit:4021
 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 
-#: ../dgit:4046
+#: ../dgit:4065
 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 
-#: ../dgit:4051
+#: ../dgit:4070
 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 
-#: ../dgit:4061
+#: ../dgit:4080
 #, perl-format
 msgid "commit id %s"
 msgstr ""
 
-#: ../dgit:4067
+#: ../dgit:4086
 #, perl-format
 msgid "and left in %s"
 msgstr ""
 
-#: ../dgit:4093
+#: ../dgit:4112
 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:4096
+#: ../dgit:4115
 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:4104
+#: ../dgit:4123
 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 
-#: ../dgit:4113
+#: ../dgit:4132
 msgid "version currently in archive"
 msgstr ""
 
-#: ../dgit:4122
+#: ../dgit:4141
 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 
-#: ../dgit:4130
+#: ../dgit:4149
 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 
-#: ../dgit:4141
+#: ../dgit:4160
 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 
-#: ../dgit:4144
+#: ../dgit:4163
 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 
-#: ../dgit:4158
+#: ../dgit:4177
 #, perl-format
 msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 
-#: ../dgit:4214
+#: ../dgit:4233
 msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 
-#: ../dgit:4223
+#: ../dgit:4242
 msgid "maintainer view tag"
 msgstr ""
 
-#: ../dgit:4225
+#: ../dgit:4244
 msgid "dgit view tag"
 msgstr ""
 
-#: ../dgit:4226
+#: ../dgit:4245
 msgid "current archive contents"
 msgstr ""
 
-#: ../dgit:4239
+#: ../dgit:4258
 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 
-#: ../dgit:4249
+#: ../dgit:4268
 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4250
+#: ../dgit:4269
 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4254
+#: ../dgit:4273
 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 
-#: ../dgit:4267
+#: ../dgit:4286
 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 
-#: ../dgit:4275
+#: ../dgit:4294
 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 
-#: ../dgit:4287
+#: ../dgit:4306
 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 
-#: ../dgit:4309
+#: ../dgit:4328
 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 
-#: ../dgit:4363
+#: ../dgit:4382
 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 
-#: ../dgit:5609
+#: ../dgit:5642
 msgid "maximum search space exceeded"
 msgstr ""
 
-#: ../dgit:5627
+#: ../dgit:5660
 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 
-#: ../dgit:5636
+#: ../dgit:5669
 msgid "root commit"
 msgstr ""
 
-#: ../dgit:5642
+#: ../dgit:5675
 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 
-#: ../dgit:5654
+#: ../dgit:5687
 #, perl-format
 msgid "changed %s"
 msgstr ""
 
-#: ../dgit:5673
+#: ../dgit:5706
 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 
-#: ../dgit:5680
+#: ../dgit:5713
 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 
-#: ../dgit:5692
+#: ../dgit:5725
 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 
-#: ../dgit:5695
+#: ../dgit:5728
 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 
-#: ../dgit:5707
+#: ../dgit:5740
 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"
@@ -1069,84 +1069,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:5714
+#: ../dgit:5747
 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 
-#: ../dgit:5748
+#: ../dgit:5781
 msgid "contains unexpected slashes\n"
 msgstr ""
 
-#: ../dgit:5749
+#: ../dgit:5782
 msgid "contains leading punctuation\n"
 msgstr ""
 
-#: ../dgit:5750
+#: ../dgit:5783
 msgid "contains bad character(s)\n"
 msgstr ""
 
-#: ../dgit:5751
+#: ../dgit:5784
 msgid "is series file\n"
 msgstr ""
 
-#: ../dgit:5752
+#: ../dgit:5785
 msgid "too long\n"
 msgstr ""
 
-#: ../dgit:5756
+#: ../dgit:5789
 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 
-#: ../dgit:5785
+#: ../dgit:5818
 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 
-#: ../dgit:5868
+#: ../dgit:5901
 #, perl-format
 msgid ""
 "quilt mode %s does not make sense (or is not supported) with single-debian-"
 "patch"
 msgstr ""
 
-#: ../dgit:5886
+#: ../dgit:5919
 msgid "converted"
 msgstr ""
 
-#: ../dgit:5887
+#: ../dgit:5920
 #, perl-format
 msgid "dgit view: created (%s)"
 msgstr ""
 
-#: ../dgit:5941
+#: ../dgit:5974
 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 
-#: ../dgit:5951
+#: ../dgit:5984
 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 
-#: ../dgit:6061
+#: ../dgit:6094
 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 
-#: ../dgit:6093
+#: ../dgit:6126
 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 
-#: ../dgit:6098
+#: ../dgit:6131
 msgid "dgit view: found cached, no changes required"
 msgstr ""
 
-#: ../dgit:6133
+#: ../dgit:6166
 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6247
+#: ../dgit:6280
 msgid ""
 "failed to apply your git tree's patch stack (from debian/patches/) to\n"
 " the corresponding upstream tarball(s).  Your source tree and .orig\n"
@@ -1154,84 +1154,84 @@ msgid ""
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 
-#: ../dgit:6261
+#: ../dgit:6294
 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 
-#: ../dgit:6295
+#: ../dgit:6328
 msgid "baredebian quilt fixup: could not find any origs"
 msgstr ""
 
-#: ../dgit:6308
+#: ../dgit:6341
 msgid "tarball"
 msgstr ""
 
-#: ../dgit:6326
+#: ../dgit:6359
 #, perl-format
 msgid "Combine orig tarballs for %s %s"
 msgstr ""
 
-#: ../dgit:6342
+#: ../dgit:6375
 msgid "tarballs"
 msgstr ""
 
-#: ../dgit:6356
+#: ../dgit:6389
 msgid "upstream"
 msgstr ""
 
-#: ../dgit:6380
+#: ../dgit:6413
 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 
-#: ../dgit:6390
+#: ../dgit:6423
 #, perl-format
 msgid ""
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n"
 "%s: quilt differences: %9.00009s %s o+d/p          %9.00009s %s o+d/p"
 msgstr ""
 
-#: ../dgit:6399
+#: ../dgit:6432
 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 
-#: ../dgit:6403
+#: ../dgit:6436
 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 
-#: ../dgit:6410
+#: ../dgit:6443
 msgid ""
 "This has only a debian/ directory; you probably want --quilt=bare debian."
 msgstr ""
 
-#: ../dgit:6414
+#: ../dgit:6447
 msgid "This might be a patches-unapplied branch."
 msgstr ""
 
-#: ../dgit:6417
+#: ../dgit:6450
 msgid "This might be a patches-applied branch."
 msgstr ""
 
-#: ../dgit:6420
+#: ../dgit:6453
 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 
-#: ../dgit:6423
+#: ../dgit:6456
 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 
-#: ../dgit:6427
+#: ../dgit:6460
 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 
-#: ../dgit:6438
+#: ../dgit:6471
 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6477
+#: ../dgit:6510
 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1240,124 +1240,137 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:6489
+#: ../dgit:6522
 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 
-#: ../dgit:6518
+#: ../dgit:6551
 msgid ""
 "If this is just missing .gitignore entries, use a different clean\n"
 "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
 "or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
 msgstr ""
 
-#: ../dgit:6530
+#: ../dgit:6563
 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 
-#: ../dgit:6533
+#: ../dgit:6566
 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
 msgstr ""
 
-#: ../dgit:6536
+#: ../dgit:6569
 msgid ""
 "tree contains uncommited, untracked, unignored files\n"
 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
 msgstr ""
 
-#: ../dgit:6549
+#: ../dgit:6582
 #, perl-format
 msgid ""
 "quilt mode %s (generally needs untracked upstream files)\n"
 "contradicts clean mode %s (which would delete them)\n"
 msgstr ""
 
-#: ../dgit:6566
+#: ../dgit:6599
 msgid "tree contains uncommitted files (after running rules clean)"
 msgstr ""
 
-#: ../dgit:6580
+#: ../dgit:6613
 msgid "clean takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6599
+#: ../dgit:6632
 #, perl-format
 msgid "-p specified package %s, but changelog says %s"
 msgstr ""
 
-#: ../dgit:6609
+#: ../dgit:6642
 msgid ""
 "dgit: --include-dirty is not supported with split view (including with view-"
 "splitting quilt modes)"
 msgstr ""
 
-#: ../dgit:6618
+#: ../dgit:6651
 #, perl-format
 msgid "dgit: --quilt=%s, %s"
 msgstr ""
 
-#: ../dgit:6622
+#: ../dgit:6655
 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
 msgstr ""
 
-#: ../dgit:6657
+#: ../dgit:6690
 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 
-#: ../dgit:6659
+#: ../dgit:6692
 #, perl-format
 msgid "would remove %s"
 msgstr ""
 
-#: ../dgit:6685
+#: ../dgit:6710
+#, perl-format
+msgid "warning: dgit option %s must be passed before %s on dgit command line\n"
+msgstr ""
+
+#: ../dgit:6717
+#, perl-format
+msgid ""
+"warning: option %s should probably be passed to dgit before %s sub-command "
+"on the dgit command line, so that it is seen by dgit and not simply passed "
+"to %s\n"
+msgstr ""
+
+#: ../dgit:6743
 msgid "archive query failed (queried because --since-version not specified)"
 msgstr ""
 
-#: ../dgit:6691
+#: ../dgit:6749
 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 
-#: ../dgit:6694
+#: ../dgit:6752
 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 
-#: ../dgit:6737
+#: ../dgit:6795
 msgid "Wanted to build nothing!"
 msgstr ""
 
-#: ../dgit:6775
+#: ../dgit:6833
 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 
-#: ../dgit:6782
+#: ../dgit:6840
 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 
-#: ../dgit:6789
+#: ../dgit:6847
 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 
-#: ../dgit:6793
+#: ../dgit:6851
 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 
-#: ../dgit:6798
+#: ../dgit:6856
 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 
-#: ../dgit:6801
+#: ../dgit:6859
 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 
-#: ../dgit:6814
+#: ../dgit:6872
 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "
@@ -1365,136 +1378,136 @@ msgid ""
 "Suggest you delete %s.\n"
 msgstr ""
 
-#: ../dgit:6832
+#: ../dgit:6890
 msgid "build successful\n"
 msgstr ""
 
-#: ../dgit:6839
+#: ../dgit:6898
 #, perl-format
 msgid ""
 "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
 "%s: warning: build-products-dir will be ignored; files will go to ..\n"
 msgstr ""
 
-#: ../dgit:6949
+#: ../dgit:7009
 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 
-#: ../dgit:6986
+#: ../dgit:7046
 msgid "--include-dirty not supported with --build-products-dir, sorry"
 msgstr ""
 
-#: ../dgit:7006
+#: ../dgit:7066
 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 
-#: ../dgit:7019
+#: ../dgit:7079
 msgid "build-source takes no additional arguments"
 msgstr ""
 
-#: ../dgit:7023
+#: ../dgit:7083
 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 
-#: ../dgit:7030
+#: ../dgit:7090
 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 
-#: ../dgit:7036
+#: ../dgit:7096
 msgid "source changes file"
 msgstr ""
 
-#: ../dgit:7038
+#: ../dgit:7098
 msgid "user-specified changes file is not source-only"
 msgstr ""
 
-#: ../dgit:7058 ../dgit:7060
+#: ../dgit:7118 ../dgit:7120
 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 
-#: ../dgit:7073
+#: ../dgit:7134
 msgid ""
 "perhaps you need to pass -A ?  (sbuild's default is to build only\n"
 "arch-specific binaries; dgit 1.4 used to override that.)\n"
 msgstr ""
 
-#: ../dgit:7085
+#: ../dgit:7147
 msgid ""
 "you asked for a builder but your debbuildopts didn't ask for any binaries -- "
 "is this really what you meant?"
 msgstr ""
 
-#: ../dgit:7089
+#: ../dgit:7151
 msgid ""
 "we must build a .dsc to pass to the builder but your debbuiltopts forbids "
 "the building of a source package; cannot continue"
 msgstr ""
 
-#: ../dgit:7119
+#: ../dgit:7181
 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 
-#: ../dgit:7140
+#: ../dgit:7202
 msgid "source tree"
 msgstr ""
 
-#: ../dgit:7142
+#: ../dgit:7204
 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 
-#: ../dgit:7155
+#: ../dgit:7217
 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 
-#: ../dgit:7159
+#: ../dgit:7221
 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 
-#: ../dgit:7163
+#: ../dgit:7225
 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 
-#: ../dgit:7180
+#: ../dgit:7242
 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 
-#: ../dgit:7185
+#: ../dgit:7247
 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 
-#: ../dgit:7187
+#: ../dgit:7249
 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 
-#: ../dgit:7198
+#: ../dgit:7260
 msgid "import-dsc signature check failed"
 msgstr ""
 
-#: ../dgit:7201
+#: ../dgit:7263
 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 
-#: ../dgit:7212
+#: ../dgit:7274
 msgid "Dgit metadata in .dsc"
 msgstr ""
 
-#: ../dgit:7223
+#: ../dgit:7285
 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 
-#: ../dgit:7232
+#: ../dgit:7294
 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"
@@ -1502,21 +1515,21 @@ msgid ""
 "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 
-#: ../dgit:7239
+#: ../dgit:7301
 msgid "Not fast forward, forced update."
 msgstr ""
 
-#: ../dgit:7241
+#: ../dgit:7303
 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 
-#: ../dgit:7246
+#: ../dgit:7308
 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 
-#: ../dgit:7251
+#: ../dgit:7313
 #, perl-format
 msgid ""
 "Branch %s already exists\n"
@@ -1524,129 +1537,129 @@ msgid ""
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 
-#: ../dgit:7271
+#: ../dgit:7333
 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 
-#: ../dgit:7273
+#: ../dgit:7335
 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 
-#: ../dgit:7281
+#: ../dgit:7343
 #, perl-format
 msgid "import %s requires %s, but: %s"
 msgstr ""
 
-#: ../dgit:7300
+#: ../dgit:7362
 #, perl-format
 msgid "cannot import %s which seems to be inside working tree!"
 msgstr ""
 
-#: ../dgit:7304
+#: ../dgit:7366
 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 
-#: ../dgit:7305
+#: ../dgit:7367
 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 
-#: ../dgit:7316
+#: ../dgit:7378
 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 
-#: ../dgit:7318
+#: ../dgit:7380
 msgid "Import, merging."
 msgstr ""
 
-#: ../dgit:7332
+#: ../dgit:7394
 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 
-#: ../dgit:7341
+#: ../dgit:7403
 #, perl-format
 msgid "results are in git ref %s"
 msgstr ""
 
-#: ../dgit:7348
+#: ../dgit:7410
 msgid "need only 1 subpath argument"
 msgstr ""
 
-#: ../dgit:7366
+#: ../dgit:7428
 msgid "need destination argument"
 msgstr ""
 
-#: ../dgit:7371
+#: ../dgit:7433
 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 
-#: ../dgit:7379
+#: ../dgit:7441
 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 
-#: ../dgit:7390
+#: ../dgit:7452
 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 
-#: ../dgit:7396
+#: ../dgit:7458
 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 
-#: ../dgit:7403 ../dgit:7409
+#: ../dgit:7465 ../dgit:7471
 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 
-#: ../dgit:7415
+#: ../dgit:7477
 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 
-#: ../dgit:7462
+#: ../dgit:7524
 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 
-#: ../dgit:7501
+#: ../dgit:7563
 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 
-#: ../dgit:7505
+#: ../dgit:7567
 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 
-#: ../dgit:7605
+#: ../dgit:7667
 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 
-#: ../dgit:7623
+#: ../dgit:7685
 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 
-#: ../dgit:7678
+#: ../dgit:7740
 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 
-#: ../dgit:7693
+#: ../dgit:7755
 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 
-#: ../dgit:7697
+#: ../dgit:7759
 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 
-#: ../dgit:7703
+#: ../dgit:7765
 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"
@@ -1654,35 +1667,35 @@ msgid ""
 "Giving up.\n"
 msgstr ""
 
-#: ../dgit:7720
+#: ../dgit:7782
 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 
-#: ../dgit:7733
+#: ../dgit:7795
 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 
-#: ../dgit:7753
+#: ../dgit:7815
 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 
-#: ../dgit:7764
+#: ../dgit:7826
 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 
-#: ../dgit:7792
+#: ../dgit:7854
 msgid "DRY RUN ONLY\n"
 msgstr ""
 
-#: ../dgit:7793
+#: ../dgit:7855
 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 
-#: ../dgit:7812
+#: ../dgit:7874
 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
@@ -2364,93 +2377,93 @@ msgstr ""
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:296
+#: ../Debian/Dgit.pm:298
 #, perl-format
 msgid "error: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:322
+#: ../Debian/Dgit.pm:324
 #, perl-format
 msgid "getcwd failed: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:341
+#: ../Debian/Dgit.pm:343
 msgid "terminated, reporting successful completion"
 msgstr ""
 
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:345
 #, perl-format
 msgid "failed with error exit status %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:346
+#: ../Debian/Dgit.pm:348
 #, perl-format
 msgid "died due to fatal signal %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:350
+#: ../Debian/Dgit.pm:352
 #, perl-format
 msgid "failed with unknown wait status %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:356
+#: ../Debian/Dgit.pm:358
 msgid "failed command"
 msgstr ""
 
-#: ../Debian/Dgit.pm:362
+#: ../Debian/Dgit.pm:364
 #, perl-format
 msgid "failed to fork/exec: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:364
+#: ../Debian/Dgit.pm:366
 #, perl-format
 msgid "subprocess %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:366
+#: ../Debian/Dgit.pm:368
 msgid "subprocess produced invalid output"
 msgstr ""
 
-#: ../Debian/Dgit.pm:457
+#: ../Debian/Dgit.pm:459
 msgid "stat source file: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:467
+#: ../Debian/Dgit.pm:469
 msgid "stat destination file: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:486
+#: ../Debian/Dgit.pm:488
 msgid "finally install file after cp: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:492
+#: ../Debian/Dgit.pm:494
 msgid "delete old file after cp: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:513
+#: ../Debian/Dgit.pm:515
 msgid ""
 "not in a git working tree?\n"
 "(git rev-parse --show-toplevel produced no output)\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:516
+#: ../Debian/Dgit.pm:518
 #, perl-format
 msgid "chdir toplevel %s: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:624
+#: ../Debian/Dgit.pm:626
 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:625
+#: ../Debian/Dgit.pm:627
 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:647
+#: ../Debian/Dgit.pm:649
 msgid "using specified upstream commitish"
 msgstr ""
 
-#: ../Debian/Dgit.pm:653
+#: ../Debian/Dgit.pm:655
 #, perl-format
 msgid ""
 "Could not determine appropriate upstream commitish.\n"
@@ -2458,66 +2471,66 @@ msgid ""
 " Check version, and specify upstream commitish explicitly."
 msgstr ""
 
-#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661
+#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663
 #, perl-format
 msgid "using upstream from git tag %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:767
+#: ../Debian/Dgit.pm:769
 msgid "detached HEAD"
 msgstr ""
 
-#: ../Debian/Dgit.pm:768
+#: ../Debian/Dgit.pm:770
 msgid "HEAD symref is not to refs/"
 msgstr ""
 
-#: ../Debian/Dgit.pm:784
+#: ../Debian/Dgit.pm:786
 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 
-#: ../Debian/Dgit.pm:793
+#: ../Debian/Dgit.pm:795
 #, perl-format
 msgid ""
 "control file %s is (already) PGP-signed.  Note that dgit push needs to "
 "modify the .dsc and then do the signature itself"
 msgstr ""
 
-#: ../Debian/Dgit.pm:807
+#: ../Debian/Dgit.pm:809
 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:828
+#: ../Debian/Dgit.pm:830
 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:914
+#: ../Debian/Dgit.pm:916
 msgid "Dummy commit - do not use\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:935
+#: ../Debian/Dgit.pm:937
 #, perl-format
 msgid "exec %s: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:1003
+#: ../Debian/Dgit.pm:1005
 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:1026
+#: ../Debian/Dgit.pm:1028
 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:1034
+#: ../Debian/Dgit.pm:1036
 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:1043
+#: ../Debian/Dgit.pm:1045
 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""