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=b0e64d47bf632488ed4e432c6c35830901b7c334;hpb=959378575613bf9b08ad8f624f5145b606cd60d0;p=dgit.git

diff --git a/po/en_US.po b/po/en_US.po
index b0e64d47..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-03-01 21:54+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,78 +17,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../dgit:242
+#: ../dgit:267
 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 
-#: ../dgit:249
+#: ../dgit:274
 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 
-#: ../dgit:257
+#: ../dgit:282
 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 
-#: ../dgit:262
+#: ../dgit:287
 #, perl-format
 msgid "%s: source package %s does not exist in suite %s\n"
 msgstr ""
 
-#: ../dgit:487
+#: ../dgit:519
 #, perl-format
 msgid "build host child %s"
 msgstr ""
 
-#: ../dgit:492 ../dgit:498
+#: ../dgit:524 ../dgit:530
 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 
-#: ../dgit:493
+#: ../dgit:525
 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 
-#: ../dgit:501
+#: ../dgit:533
 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 
-#: ../dgit:508
+#: ../dgit:540
 msgid "protocol message"
 msgstr ""
 
-#: ../dgit:516
+#: ../dgit:548
 #, perl-format
 msgid "`%s'"
 msgstr ""
 
-#: ../dgit:537
+#: ../dgit:569
 msgid "bad byte count"
 msgstr ""
 
-#: ../dgit:540
+#: ../dgit:572
 msgid "data block"
 msgstr ""
 
-#: ../dgit:621
-#, perl-format
-msgid "failed to fetch %s: %s"
-msgstr ""
-
-#: ../dgit:633
+#: ../dgit:651
 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 
-#: ../dgit:635
+#: ../dgit:653
 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 
-#: ../dgit:660
+#: ../dgit:678
 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -109,141 +104,147 @@ msgid ""
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 
-#: ../dgit:679
+#: ../dgit:697
 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 
-#: ../dgit:683
+#: ../dgit:701
 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 
-#: ../dgit:688
+#: ../dgit:706
 msgid "too few arguments"
 msgstr ""
 
-#: ../dgit:799
+#: ../dgit:822
 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 
-#: ../dgit:802
+#: ../dgit:825
 #, perl-format
 msgid "value for config option %s (in %s git config) contains newline(s)!"
 msgstr ""
 
-#: ../dgit:822
+#: ../dgit:845
 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 
-#: ../dgit:863
+#: ../dgit:902
 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 
-#: ../dgit:878
+#: ../dgit:917
 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 
-#: ../dgit:894
+#: ../dgit:933
 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 
-#: ../dgit:914
+#: ../dgit:953
 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:971
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211
 msgid "internal error"
 msgstr ""
 
-#: ../dgit:925
+#: ../dgit:978
 msgid "pushing but distro is configured readonly"
 msgstr ""
 
-#: ../dgit:929
+#: ../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:1094
-msgid "this operation does not support multiple comma-separated suites"
-msgstr ""
-
-#: ../dgit:1140
+#: ../dgit:1005
 #, perl-format
 msgid ""
-"config requested specific TLS key but do not know how to get curl to use "
-"exactly that EE key (%s)"
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
 msgstr ""
 
-#: ../dgit:1161
-msgid "ftpmasterapi archive query method takes no data part"
+#: ../dgit:1168
+msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 
-#: ../dgit:1169
-msgid "curl failed to print 3-digit HTTP code"
+#: ../dgit:1236
+#, perl-format
+msgid "fetch of %s failed (%s): %s"
 msgstr ""
 
-#: ../dgit:1173
+#: ../dgit:1243
 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 
-#: ../dgit:1189
+#: ../dgit:1264
+msgid "ftpmasterapi archive query method takes no data part"
+msgstr ""
+
+#: ../dgit:1282
 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 
-#: ../dgit:1193
+#: ../dgit:1286
 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 
-#: ../dgit:1195
+#: ../dgit:1288
 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 
-#: ../dgit:1197
+#: ../dgit:1290
 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1292 ../dgit:1317
 msgid "bad ftpmaster api response: "
 msgstr ""
 
-#: ../dgit:1213
+#: ../dgit:1306
 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 
-#: ../dgit:1215
+#: ../dgit:1308
 msgid "bad component"
 msgstr ""
 
-#: ../dgit:1218
+#: ../dgit:1311
 msgid "bad filename"
 msgstr ""
 
-#: ../dgit:1220
+#: ../dgit:1313
 msgid "bad sha256sum"
 msgstr ""
 
-#: ../dgit:1271
+#: ../dgit:1364
 msgid "aptget archive query method takes no data part"
 msgstr ""
 
-#: ../dgit:1355
+#: ../dgit:1448
 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -251,163 +252,159 @@ msgid ""
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 
-#: ../dgit:1377
+#: ../dgit:1472
 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 
-#: ../dgit:1405
+#: ../dgit:1498
 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 
-#: ../dgit:1406
+#: ../dgit:1499
 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 
-#: ../dgit:1511
+#: ../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:1702
+#: ../dgit:1743
 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 
-#: ../dgit:1705
+#: ../dgit:1746
 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 
-#: ../dgit:1707
+#: ../dgit:1748
 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 
-#: ../dgit:1727
+#: ../dgit:1768
 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 
-#: ../dgit:1733
+#: ../dgit:1774
 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 
-#: ../dgit:1760
+#: ../dgit:1801
 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 
-#: ../dgit:1777
-msgid "unexpected results from git check query - "
-msgstr ""
-
-#: ../dgit:1792
+#: ../dgit:1824
 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 
-#: ../dgit:1807
+#: ../dgit:1839
 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 
-#: ../dgit:1844
+#: ../dgit:1876
 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 
-#: ../dgit:1890
+#: ../dgit:1922
 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 
-#: ../dgit:1901
+#: ../dgit:1933
 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 
-#: ../dgit:1947
+#: ../dgit:1979
 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 
-#: ../dgit:1956
+#: ../dgit:1988
 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 
-#: ../dgit:1960
+#: ../dgit:1992
 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 
-#: ../dgit:1966
+#: ../dgit:1998
 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 
-#: ../dgit:2006
+#: ../dgit:2038
 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 
-#: ../dgit:2019
+#: ../dgit:2051
 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 
-#: ../dgit:2032
+#: ../dgit:2064
 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 
-#: ../dgit:2048
+#: ../dgit:2080
 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 
-#: ../dgit:2053
+#: ../dgit:2085
 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 
-#: ../dgit:2061
+#: ../dgit:2093
 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 
-#: ../dgit:2068
+#: ../dgit:2100
 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 
-#: ../dgit:2096
+#: ../dgit:2128
 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 
-#: ../dgit:2104
+#: ../dgit:2136
 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 
-#: ../dgit:2107
+#: ../dgit:2139
 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 
-#: ../dgit:2131
+#: ../dgit:2158
 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 
-#: ../dgit:2154
+#: ../dgit:2181
 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -422,113 +419,108 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:2166
+#: ../dgit:2193
 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 
-#: ../dgit:2197
+#: ../dgit:2224
 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 
-#: ../dgit:2199
+#: ../dgit:2226
 msgid "(base) distro being accessed"
 msgstr ""
 
-#: ../dgit:2201
+#: ../dgit:2228
 msgid "(nominal) distro being accessed"
 msgstr ""
 
-#: ../dgit:2206
+#: ../dgit:2233
 #, perl-format
 msgid "build-products-dir %s is not accessible: %s\n"
 msgstr ""
 
-#: ../dgit:2231
+#: ../dgit:2258
 #, perl-format
 msgid ""
 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
 msgstr ""
 
-#: ../dgit:2235
+#: ../dgit:2262
 #, perl-format
 msgid "check orig file %s in bpd %s: %s"
 msgstr ""
 
-#: ../dgit:2237
+#: ../dgit:2264
 #, perl-format
 msgid "check orig file %s in ..: %s"
 msgstr ""
 
-#: ../dgit:2240
+#: ../dgit:2267
 #, perl-format
 msgid "check target of orig symlink %s in ..: %s"
 msgstr ""
 
-#: ../dgit:2249
+#: ../dgit:2276
 #, perl-format
 msgid "%s: cloned orig symlink from ..: %s\n"
 msgstr ""
 
-#: ../dgit:2253
+#: ../dgit:2280
 #, perl-format
 msgid "%s: hardlinked orig from ..: %s\n"
 msgstr ""
 
-#: ../dgit:2256
+#: ../dgit:2283
 #, perl-format
 msgid "failed to make %s a hardlink to %s: %s"
 msgstr ""
 
-#: ../dgit:2262
+#: ../dgit:2289
 #, perl-format
 msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
 msgstr ""
 
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2386
+#: ../dgit:2360
 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2468
+#: ../dgit:2422
 msgid "package changelog"
 msgstr ""
 
-#: ../dgit:2508
+#: ../dgit:2462
 msgid "package changelog has no entries!"
 msgstr ""
 
-#: ../dgit:2527
+#: ../dgit:2531 ../dgit:2536
 #, perl-format
-msgid "Import %s"
+msgid "accessing %s: %s"
 msgstr ""
 
-#: ../dgit:2608
+#: ../dgit:2551 ../dgit:2558
+#, perl-format
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2584 ../dgit:6070
+msgid "source package"
+msgstr ""
+
+#: ../dgit:2662
 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 
-#: ../dgit:2627
+#: ../dgit:2681
 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: ../dgit:2636
+#: ../dgit:2690
 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"
@@ -537,21 +529,16 @@ msgid ""
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 
-#: ../dgit:2651
+#: ../dgit:2705
 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 
-#: ../dgit:2655
+#: ../dgit:2709
 msgid "Import of source package"
 msgstr ""
 
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2672
+#: ../dgit:2729
 #, perl-format
 msgid ""
 "\n"
@@ -560,51 +547,51 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:2714
+#: ../dgit:2771
 #, perl-format
 msgid "using existing %s"
 msgstr ""
 
-#: ../dgit:2718
+#: ../dgit:2775
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 
-#: ../dgit:2722
+#: ../dgit:2779
 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 
-#: ../dgit:2738
+#: ../dgit:2795
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 
-#: ../dgit:2833
+#: ../dgit:2890
 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 
-#: ../dgit:2848
+#: ../dgit:2905
 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 
-#: ../dgit:2892
+#: ../dgit:2949
 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 
-#: ../dgit:2907
+#: ../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:2912
+#: ../dgit:2969
 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"
@@ -614,49 +601,24 @@ msgid ""
 "warning:  Will try again...\n"
 msgstr ""
 
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3063
+#: ../dgit:3116
 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 
-#: ../dgit:3068
+#: ../dgit:3121
 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 
-#: ../dgit:3073
+#: ../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:3083
+#: ../dgit:3136
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
@@ -665,54 +627,54 @@ msgid ""
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 
-#: ../dgit:3103
+#: ../dgit:3156
 msgid "rewrite map"
 msgstr ""
 
-#: ../dgit:3110
+#: ../dgit:3163
 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 
-#: ../dgit:3114
+#: ../dgit:3167
 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 
-#: ../dgit:3116
+#: ../dgit:3169
 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 
-#: ../dgit:3123
+#: ../dgit:3176
 msgid "additional commits"
 msgstr ""
 
-#: ../dgit:3126
+#: ../dgit:3179
 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 
-#: ../dgit:3151
+#: ../dgit:3204
 msgid "last upload to archive"
 msgstr ""
 
-#: ../dgit:3155
+#: ../dgit:3208
 msgid "no version available from the archive"
 msgstr ""
 
-#: ../dgit:3238
+#: ../dgit:3291
 msgid "dgit suite branch on dgit git server"
 msgstr ""
 
-#: ../dgit:3245
+#: ../dgit:3298
 msgid "dgit client's archive history view"
 msgstr ""
 
-#: ../dgit:3250
+#: ../dgit:3303
 msgid "Dgit field in .dsc from archive"
 msgstr ""
 
-#: ../dgit:3278
+#: ../dgit:3331
 #, perl-format
 msgid ""
 "\n"
@@ -722,15 +684,15 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3291
+#: ../dgit:3344
 msgid "archive .dsc names newer git commit"
 msgstr ""
 
-#: ../dgit:3294
+#: ../dgit:3347
 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 
-#: ../dgit:3315
+#: ../dgit:3368
 #, perl-format
 msgid ""
 "\n"
@@ -738,7 +700,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../dgit:3324
+#: ../dgit:3377
 #, perl-format
 msgid ""
 "\n"
@@ -748,7 +710,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3409
+#: ../dgit:3462
 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"
@@ -756,19 +718,19 @@ msgid ""
 "Record that\n"
 msgstr ""
 
-#: ../dgit:3422
+#: ../dgit:3475
 msgid "should be treated as descended from\n"
 msgstr ""
 
-#: ../dgit:3440
+#: ../dgit:3493
 msgid "dgit repo server tip (last push)"
 msgstr ""
 
-#: ../dgit:3442
+#: ../dgit:3495
 msgid "local tracking tip (last fetch)"
 msgstr ""
 
-#: ../dgit:3453
+#: ../dgit:3506
 #, perl-format
 msgid ""
 "\n"
@@ -778,30 +740,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3468
+#: ../dgit:3521
 msgid "fetched source tree"
 msgstr ""
 
-#: ../dgit:3504
+#: ../dgit:3557
 msgid "debian/changelog merge driver"
 msgstr ""
 
-#: ../dgit:3569
+#: ../dgit:3622
 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 
-#: ../dgit:3583
+#: ../dgit:3636
 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 
-#: ../dgit:3598
+#: ../dgit:3651
 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 
-#: ../dgit:3625
+#: ../dgit:3678
 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"
@@ -809,30 +771,30 @@ msgid ""
 "tree.\n"
 msgstr ""
 
-#: ../dgit:3647
+#: ../dgit:3700
 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 
-#: ../dgit:3655
+#: ../dgit:3708
 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 
-#: ../dgit:3694
+#: ../dgit:3747
 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 
-#: ../dgit:3726
+#: ../dgit:3779
 msgid "local combined tracking branch"
 msgstr ""
 
-#: ../dgit:3728
+#: ../dgit:3781
 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 
-#: ../dgit:3767
+#: ../dgit:3820
 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"
@@ -840,7 +802,7 @@ msgid ""
 "Input branches:\n"
 msgstr ""
 
-#: ../dgit:3781
+#: ../dgit:3834
 msgid ""
 "\n"
 "Key\n"
@@ -849,613 +811,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:3796
+#: ../dgit:3849
 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 
-#: ../dgit:3814
+#: ../dgit:3867
 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 
-#: ../dgit:3822
+#: ../dgit:3885
 msgid "dry run makes no sense with clone"
 msgstr ""
 
-#: ../dgit:3837
+#: ../dgit:3900
 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 
-#: ../dgit:3853
+#: ../dgit:3912
 msgid "fetching existing git history"
 msgstr ""
 
-#: ../dgit:3857
+#: ../dgit:3915
 msgid "starting new git history"
 msgstr ""
 
-#: ../dgit:3883
+#: ../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:3888
+#: ../dgit:3945
 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 
-#: ../dgit:3900
+#: ../dgit:3957
 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 
-#: ../dgit:3902
+#: ../dgit:3959
 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 
-#: ../dgit:3910
+#: ../dgit:3967
 #, perl-format
 msgid "git tree contains %s"
 msgstr ""
 
-#: ../dgit:3921
+#: ../dgit:3978
 msgid "you have uncommitted changes to critical files, cannot continue:\n"
 msgstr ""
 
-#: ../dgit:3940
+#: ../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:3957
+#: ../dgit:4014
 msgid "nothing quilty to commit, ok."
 msgstr ""
 
-#: ../dgit:3960
+#: ../dgit:4017
 msgid " (wanted to commit patch update)"
 msgstr ""
 
-#: ../dgit:3964
+#: ../dgit:4021
 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 
-#: ../dgit:4007
+#: ../dgit:4065
 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 
-#: ../dgit:4012
+#: ../dgit:4070
 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 
-#: ../dgit:4022
+#: ../dgit:4080
 #, perl-format
 msgid "commit id %s"
 msgstr ""
 
-#: ../dgit:4028
+#: ../dgit:4086
 #, perl-format
 msgid "and left in %s"
 msgstr ""
 
-#: ../dgit:4054
+#: ../dgit:4112
 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:4057
+#: ../dgit:4115
 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 
-#: ../dgit:4065
+#: ../dgit:4123
 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 
-#: ../dgit:4074
+#: ../dgit:4132
 msgid "version currently in archive"
 msgstr ""
 
-#: ../dgit:4083
+#: ../dgit:4141
 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 
-#: ../dgit:4091
+#: ../dgit:4149
 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 
-#: ../dgit:4101
+#: ../dgit:4160
 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 
-#: ../dgit:4104
+#: ../dgit:4163
 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 
-#: ../dgit:4118
+#: ../dgit:4177
 #, perl-format
 msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 
-#: ../dgit:4174
+#: ../dgit:4233
 msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 
-#: ../dgit:4183
+#: ../dgit:4242
 msgid "maintainer view tag"
 msgstr ""
 
-#: ../dgit:4185
+#: ../dgit:4244
 msgid "dgit view tag"
 msgstr ""
 
-#: ../dgit:4186
+#: ../dgit:4245
 msgid "current archive contents"
 msgstr ""
 
-#: ../dgit:4199
+#: ../dgit:4258
 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 
-#: ../dgit:4209
+#: ../dgit:4268
 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4210
+#: ../dgit:4269
 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 
-#: ../dgit:4214
+#: ../dgit:4273
 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 
-#: ../dgit:4227
+#: ../dgit:4286
 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 
-#: ../dgit:4235
+#: ../dgit:4294
 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 
-#: ../dgit:4247
+#: ../dgit:4306
 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 
-#: ../dgit:4269
+#: ../dgit:4328
 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 
-#: ../dgit:4330
+#: ../dgit:4382
 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build.  Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints).  To see a full diff, run\n"
-"   git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s).  This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5499
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5565
+#: ../dgit:5642
 msgid "maximum search space exceeded"
 msgstr ""
 
-#: ../dgit:5583
+#: ../dgit:5660
 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 
-#: ../dgit:5592
+#: ../dgit:5669
 msgid "root commit"
 msgstr ""
 
-#: ../dgit:5598
+#: ../dgit:5675
 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 
-#: ../dgit:5610
+#: ../dgit:5687
 #, perl-format
 msgid "changed %s"
 msgstr ""
 
-#: ../dgit:5629
+#: ../dgit:5706
 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 
-#: ../dgit:5636
+#: ../dgit:5713
 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 
-#: ../dgit:5648
+#: ../dgit:5725
 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 
-#: ../dgit:5651
+#: ../dgit:5728
 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 
-#: ../dgit:5663
+#: ../dgit:5740
 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"
@@ -1463,68 +1069,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:5670
+#: ../dgit:5747
 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 
-#: ../dgit:5704
+#: ../dgit:5781
 msgid "contains unexpected slashes\n"
 msgstr ""
 
-#: ../dgit:5705
+#: ../dgit:5782
 msgid "contains leading punctuation\n"
 msgstr ""
 
-#: ../dgit:5706
+#: ../dgit:5783
 msgid "contains bad character(s)\n"
 msgstr ""
 
-#: ../dgit:5707
+#: ../dgit:5784
 msgid "is series file\n"
 msgstr ""
 
-#: ../dgit:5708
+#: ../dgit:5785
 msgid "too long\n"
 msgstr ""
 
-#: ../dgit:5712
+#: ../dgit:5789
 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 
-#: ../dgit:5741
+#: ../dgit:5818
 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 
-#: ../dgit:5884
+#: ../dgit:5901
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5919
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5920
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5974
 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 
-#: ../dgit:5894
+#: ../dgit:5984
 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 
-#: ../dgit:5996
+#: ../dgit:6094
 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 
-#: ../dgit:6027
+#: ../dgit:6126
 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 
-#: ../dgit:6032
+#: ../dgit:6131
 msgid "dgit view: found cached, no changes required"
 msgstr ""
 
-#: ../dgit:6043
+#: ../dgit:6166
 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6134
+#: ../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"
@@ -1532,58 +1154,84 @@ msgid ""
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 
-#: ../dgit:6148
+#: ../dgit:6294
 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 
-#: ../dgit:6185
+#: ../dgit:6328
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6341
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6359
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6375
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6389
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6413
 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 
-#: ../dgit:6188
+#: ../dgit:6423
 #, perl-format
 msgid ""
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n"
-"%s: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p          %9.00009s %s o+d/p"
 msgstr ""
 
-#: ../dgit:6194
+#: ../dgit:6432
 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 
-#: ../dgit:6198
+#: ../dgit:6436
 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 
-#: ../dgit:6205
+#: ../dgit:6443
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6447
 msgid "This might be a patches-unapplied branch."
 msgstr ""
 
-#: ../dgit:6208
+#: ../dgit:6450
 msgid "This might be a patches-applied branch."
 msgstr ""
 
-#: ../dgit:6211
+#: ../dgit:6453
 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 
-#: ../dgit:6214
+#: ../dgit:6456
 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 
-#: ../dgit:6218
+#: ../dgit:6460
 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 
-#: ../dgit:6227
+#: ../dgit:6471
 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 
-#: ../dgit:6265
+#: ../dgit:6510
 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1592,102 +1240,137 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../dgit:6277
+#: ../dgit:6522
 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 
-#: ../dgit:6306
+#: ../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:6318
+#: ../dgit:6563
 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 
-#: ../dgit:6321
+#: ../dgit:6566
 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
 msgstr ""
 
-#: ../dgit:6324
+#: ../dgit:6569
 msgid ""
 "tree contains uncommited, untracked, unignored files\n"
 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
 msgstr ""
 
-#: ../dgit:6342
+#: ../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:6599
 msgid "tree contains uncommitted files (after running rules clean)"
 msgstr ""
 
-#: ../dgit:6356
+#: ../dgit:6613
 msgid "clean takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6369
+#: ../dgit:6632
+#, perl-format
+msgid "-p specified package %s, but changelog says %s"
+msgstr ""
+
+#: ../dgit:6642
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6651
 #, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6655
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
 msgstr ""
 
-#: ../dgit:6408
+#: ../dgit:6690
 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 
-#: ../dgit:6410
+#: ../dgit:6692
 #, perl-format
 msgid "would remove %s"
 msgstr ""
 
-#: ../dgit:6436
+#: ../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:6442
+#: ../dgit:6749
 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 
-#: ../dgit:6445
+#: ../dgit:6752
 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 
-#: ../dgit:6488
+#: ../dgit:6795
 msgid "Wanted to build nothing!"
 msgstr ""
 
-#: ../dgit:6526
+#: ../dgit:6833
 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 
-#: ../dgit:6533
+#: ../dgit:6840
 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 
-#: ../dgit:6540
+#: ../dgit:6847
 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 
-#: ../dgit:6544
+#: ../dgit:6851
 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 
-#: ../dgit:6549
+#: ../dgit:6856
 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 
-#: ../dgit:6552
+#: ../dgit:6859
 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 
-#: ../dgit:6565
+#: ../dgit:6872
 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "
@@ -1695,136 +1378,136 @@ msgid ""
 "Suggest you delete %s.\n"
 msgstr ""
 
-#: ../dgit:6583
+#: ../dgit:6890
 msgid "build successful\n"
 msgstr ""
 
-#: ../dgit:6590
+#: ../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:6700
+#: ../dgit:7009
 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 
-#: ../dgit:6735
+#: ../dgit:7046
 msgid "--include-dirty not supported with --build-products-dir, sorry"
 msgstr ""
 
-#: ../dgit:6755
+#: ../dgit:7066
 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 
-#: ../dgit:6768
+#: ../dgit:7079
 msgid "build-source takes no additional arguments"
 msgstr ""
 
-#: ../dgit:6772
+#: ../dgit:7083
 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 
-#: ../dgit:6779
+#: ../dgit:7090
 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 
-#: ../dgit:6785
+#: ../dgit:7096
 msgid "source changes file"
 msgstr ""
 
-#: ../dgit:6787
+#: ../dgit:7098
 msgid "user-specified changes file is not source-only"
 msgstr ""
 
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7118 ../dgit:7120
 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 
-#: ../dgit:6822
+#: ../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:6834
+#: ../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:6838
+#: ../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:6868
+#: ../dgit:7181
 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 
-#: ../dgit:6890
+#: ../dgit:7202
 msgid "source tree"
 msgstr ""
 
-#: ../dgit:6892
+#: ../dgit:7204
 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 
-#: ../dgit:6905
+#: ../dgit:7217
 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 
-#: ../dgit:6909
+#: ../dgit:7221
 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 
-#: ../dgit:6913
+#: ../dgit:7225
 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 
-#: ../dgit:6930
+#: ../dgit:7242
 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 
-#: ../dgit:6935
+#: ../dgit:7247
 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 
-#: ../dgit:6937
+#: ../dgit:7249
 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 
-#: ../dgit:6948
+#: ../dgit:7260
 msgid "import-dsc signature check failed"
 msgstr ""
 
-#: ../dgit:6951
+#: ../dgit:7263
 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 
-#: ../dgit:6962
+#: ../dgit:7274
 msgid "Dgit metadata in .dsc"
 msgstr ""
 
-#: ../dgit:6973
+#: ../dgit:7285
 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 
-#: ../dgit:6982
+#: ../dgit:7294
 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"
@@ -1832,21 +1515,21 @@ msgid ""
 "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 
-#: ../dgit:6989
+#: ../dgit:7301
 msgid "Not fast forward, forced update."
 msgstr ""
 
-#: ../dgit:6991
+#: ../dgit:7303
 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 
-#: ../dgit:6996
+#: ../dgit:7308
 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 
-#: ../dgit:7001
+#: ../dgit:7313
 #, perl-format
 msgid ""
 "Branch %s already exists\n"
@@ -1854,134 +1537,129 @@ msgid ""
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 
-#: ../dgit:7021
+#: ../dgit:7333
 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 
-#: ../dgit:7023
+#: ../dgit:7335
 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 
-#: ../dgit:7031
+#: ../dgit:7343
 #, perl-format
 msgid "import %s requires %s, but: %s"
 msgstr ""
 
-#: ../dgit:7050
+#: ../dgit:7362
 #, perl-format
 msgid "cannot import %s which seems to be inside working tree!"
 msgstr ""
 
-#: ../dgit:7054
+#: ../dgit:7366
 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 
-#: ../dgit:7055
+#: ../dgit:7367
 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 
-#: ../dgit:7066
+#: ../dgit:7378
 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 
-#: ../dgit:7068
+#: ../dgit:7380
 msgid "Import, merging."
 msgstr ""
 
-#: ../dgit:7082
+#: ../dgit:7394
 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 
-#: ../dgit:7091
+#: ../dgit:7403
 #, perl-format
 msgid "results are in git ref %s"
 msgstr ""
 
-#: ../dgit:7098
+#: ../dgit:7410
 msgid "need only 1 subpath argument"
 msgstr ""
 
-#: ../dgit:7104
-#, perl-format
-msgid "exec curl: %s\n"
-msgstr ""
-
-#: ../dgit:7118
+#: ../dgit:7428
 msgid "need destination argument"
 msgstr ""
 
-#: ../dgit:7123
+#: ../dgit:7433
 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 
-#: ../dgit:7131
+#: ../dgit:7441
 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 
-#: ../dgit:7142
+#: ../dgit:7452
 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 
-#: ../dgit:7148
+#: ../dgit:7458
 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7465 ../dgit:7471
 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 
-#: ../dgit:7167
+#: ../dgit:7477
 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 
-#: ../dgit:7214
+#: ../dgit:7524
 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 
-#: ../dgit:7253
+#: ../dgit:7563
 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 
-#: ../dgit:7257
+#: ../dgit:7567
 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 
-#: ../dgit:7348
+#: ../dgit:7667
 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 
-#: ../dgit:7368
+#: ../dgit:7685
 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 
-#: ../dgit:7423
+#: ../dgit:7740
 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 
-#: ../dgit:7438
+#: ../dgit:7755
 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 
-#: ../dgit:7442
+#: ../dgit:7759
 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 
-#: ../dgit:7448
+#: ../dgit:7765
 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"
@@ -1989,49 +1667,40 @@ msgid ""
 "Giving up.\n"
 msgstr ""
 
-#: ../dgit:7465
+#: ../dgit:7782
 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 
-#: ../dgit:7478
+#: ../dgit:7795
 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 
-#: ../dgit:7498
+#: ../dgit:7815
 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 
-#: ../dgit:7508
+#: ../dgit:7826
 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7545
+#: ../dgit:7854
 msgid "DRY RUN ONLY\n"
 msgstr ""
 
-#: ../dgit:7546
+#: ../dgit:7855
 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 
-#: ../dgit:7565
+#: ../dgit:7874
 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
 
-#: ../git-debrebase:44
+#: ../git-debrebase:45
 msgid ""
 "usages:\n"
 "  git-debrebase [<options>] [--|-i <git rebase options...>]\n"
@@ -2044,60 +1713,60 @@ msgid ""
 "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
 msgstr ""
 
-#: ../git-debrebase:67
+#: ../git-debrebase:68
 #, perl-format
 msgid "%s: bad usage: %s\n"
 msgstr ""
 
-#: ../git-debrebase:78
+#: ../git-debrebase:79
 #, perl-format
 msgid "bad options follow `git-debrebase %s'"
 msgstr ""
 
-#: ../git-debrebase:89
+#: ../git-debrebase:90
 #, perl-format
 msgid "missing required git config %s"
 msgstr ""
 
-#: ../git-debrebase:401
+#: ../git-debrebase:363
 #, perl-format
 msgid "%s: snag ignored (-f%s): %s\n"
 msgstr ""
 
-#: ../git-debrebase:404
+#: ../git-debrebase:366
 #, perl-format
 msgid "%s: snag detected (-f%s): %s\n"
 msgstr ""
 
-#: ../git-debrebase:417
+#: ../git-debrebase:379
 #, perl-format
 msgid "%s: snags: %d overriden by individual -f options\n"
 msgstr ""
 
-#: ../git-debrebase:423
+#: ../git-debrebase:385
 #, perl-format
 msgid "%s: snags: %d overriden by global --force\n"
 msgstr ""
 
-#: ../git-debrebase:427
+#: ../git-debrebase:389
 #, perl-format
 msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
 msgstr ""
 
-#: ../git-debrebase:459
+#: ../git-debrebase:421
 msgid ""
 "Branch/history seems mangled - no longer in gdr format.\n"
 "See ILLEGAL OPERATIONS in git-debrebase(5).\n"
 msgstr ""
 
-#: ../git-debrebase:466
+#: ../git-debrebase:428
 #, perl-format
 msgid ""
 "%s\n"
 "Is this meant to be a gdr branch?  %s\n"
 msgstr ""
 
-#: ../git-debrebase:471
+#: ../git-debrebase:433
 #, perl-format
 msgid ""
 "%s\n"
@@ -2105,7 +1774,7 @@ msgid ""
 "Consider git-debrebase scrap, to throw away your recent work.\n"
 msgstr ""
 
-#: ../git-debrebase:477
+#: ../git-debrebase:439
 #, perl-format
 msgid ""
 "%s\n"
@@ -2113,7 +1782,7 @@ msgid ""
 "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
 msgstr ""
 
-#: ../git-debrebase:488
+#: ../git-debrebase:450
 #, perl-format
 msgid ""
 "%s\n"
@@ -2121,418 +1790,415 @@ msgid ""
 "Maybe you reset to, or rebased from, somewhere inappropriate.\n"
 msgstr ""
 
-#: ../git-debrebase:935
+#: ../git-debrebase:897
 #, perl-format
 msgid "git-debrebase `anchor' but %s"
 msgstr ""
 
-#: ../git-debrebase:937
+#: ../git-debrebase:899
 msgid "has other than two parents"
 msgstr ""
 
-#: ../git-debrebase:938
+#: ../git-debrebase:900
 msgid "contains debian/patches"
 msgstr ""
 
-#: ../git-debrebase:964
+#: ../git-debrebase:926
 msgid "is an origin commit"
 msgstr ""
 
-#: ../git-debrebase:966
+#: ../git-debrebase:928
 msgid "upstream files differ from left parent"
 msgstr ""
 
-#: ../git-debrebase:968
+#: ../git-debrebase:930
 msgid "debian/ differs from right parent"
 msgstr ""
 
-#: ../git-debrebase:979
+#: ../git-debrebase:941
 msgid "edits debian/patches"
 msgstr ""
 
-#: ../git-debrebase:991
+#: ../git-debrebase:953
 msgid "parent's debian is not a directory"
 msgstr ""
 
-#: ../git-debrebase:998
+#: ../git-debrebase:960
 msgid "no changes"
 msgstr ""
 
-#: ../git-debrebase:1004
+#: ../git-debrebase:966
 msgid "origin commit"
 msgstr ""
 
-#: ../git-debrebase:1055
+#: ../git-debrebase:1017
 #, perl-format
 msgid "unknown kind of merge from %s"
 msgstr ""
 
-#: ../git-debrebase:1058
+#: ../git-debrebase:1020
 msgid "octopus merge"
 msgstr ""
 
-#: ../git-debrebase:1062
+#: ../git-debrebase:1024
 msgid "general two-parent merge"
 msgstr ""
 
-#: ../git-debrebase:1079
+#: ../git-debrebase:1041
 #, perl-format
 msgid "inconsistent anchors in merged-breakwaters %s"
 msgstr ""
 
-#: ../git-debrebase:1119
+#: ../git-debrebase:1081
 #, perl-format
 msgid "branch needs laundering (run git-debrebase): %s"
 msgstr ""
 
-#: ../git-debrebase:1147
+#: ../git-debrebase:1109
 #, perl-format
 msgid "packaging change (%s) follows upstream change"
 msgstr ""
 
-#: ../git-debrebase:1148
+#: ../git-debrebase:1110
 #, perl-format
 msgid " (eg %s)"
 msgstr ""
 
-#: ../git-debrebase:1154
+#: ../git-debrebase:1116
 msgid "found mixed upstream/packaging commit"
 msgstr ""
 
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130
+#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149
 #, perl-format
 msgid " (%s)"
 msgstr ""
 
-#: ../git-debrebase:1162
+#: ../git-debrebase:1124
 #, perl-format
 msgid "found interchange bureaucracy commit (%s)"
 msgstr ""
 
-#: ../git-debrebase:1167
+#: ../git-debrebase:1129
 msgid "found dgit dsc import"
 msgstr ""
 
-#: ../git-debrebase:1172
+#: ../git-debrebase:1134
 msgid "found bare dgit dsc import with no prior history"
 msgstr ""
 
-#: ../git-debrebase:1178
+#: ../git-debrebase:1140
 msgid "found vanilla merge"
 msgstr ""
 
-#: ../git-debrebase:1185
+#: ../git-debrebase:1147
 #, perl-format
 msgid "found unprocessable commit, cannot cope: %s"
 msgstr ""
 
-#: ../git-debrebase:1253
+#: ../git-debrebase:1215
 #, perl-format
 msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
 msgstr ""
 
-#: ../git-debrebase:1254
+#: ../git-debrebase:1216
 #, perl-format
 msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
 msgstr ""
 
-#: ../git-debrebase:1375
+#: ../git-debrebase:1337
 msgid "bare dgit dsc import"
 msgstr ""
 
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1677 ../git-debrebase:1680
 #, perl-format
 msgid "mismatch %s ?"
 msgstr ""
 
-#: ../git-debrebase:1721
+#: ../git-debrebase:1683
 #, perl-format
 msgid "mismatch %s != %s ?"
 msgstr ""
 
-#: ../git-debrebase:1731
+#: ../git-debrebase:1693
 #, perl-format
 msgid "internal error %#x %s %s"
 msgstr ""
 
-#: ../git-debrebase:1759
+#: ../git-debrebase:1721
 #, perl-format
 msgid "%s: laundered (head was %s)\n"
 msgstr ""
 
-#: ../git-debrebase:1773
+#: ../git-debrebase:1735
 msgid "you are in the middle of a git-rebase already"
 msgstr ""
 
-#: ../git-debrebase:1799
+#: ../git-debrebase:1761
 msgid "launder for rebase"
 msgstr ""
 
-#: ../git-debrebase:1804
+#: ../git-debrebase:1766
 msgid "analyse does not support any options"
 msgstr ""
 
-#: ../git-debrebase:1806
+#: ../git-debrebase:1768
 msgid "too many arguments to analyse"
 msgstr ""
 
-#: ../git-debrebase:1841
+#: ../git-debrebase:1801
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1803
 msgid "HEAD symref is not to refs/heads/"
 msgstr ""
 
-#: ../git-debrebase:1864
+#: ../git-debrebase:1826
 #, perl-format
 msgid "OK, you are ahead of %s\n"
 msgstr ""
 
-#: ../git-debrebase:1868
+#: ../git-debrebase:1830
 #, perl-format
 msgid "you are behind %s, divergence risk"
 msgstr ""
 
-#: ../git-debrebase:1872
+#: ../git-debrebase:1834
 #, perl-format
 msgid "you have diverged from %s"
 msgstr ""
 
-#: ../git-debrebase:1894
+#: ../git-debrebase:1856
 msgid "remote dgit branch"
 msgstr ""
 
-#: ../git-debrebase:1897
+#: ../git-debrebase:1859
 msgid "remote dgit branch for sid"
 msgstr ""
 
-#: ../git-debrebase:1925
+#: ../git-debrebase:1887
 msgid "Recorded previous head for preservation"
 msgstr ""
 
-#: ../git-debrebase:1933
+#: ../git-debrebase:1895
 #, perl-format
 msgid "could not record ffq-prev: %s"
 msgstr ""
 
-#: ../git-debrebase:1944
+#: ../git-debrebase:1906
 #, perl-format
 msgid "could not check ffq-prev: %s"
 msgstr ""
 
-#: ../git-debrebase:1964
+#: ../git-debrebase:1926
 msgid "fast forward"
 msgstr ""
 
-#: ../git-debrebase:1974
+#: ../git-debrebase:1936
 msgid "Declare fast forward / record previous work"
 msgstr ""
 
-#: ../git-debrebase:1986
+#: ../git-debrebase:1948
 msgid "No ffq-prev to stitch."
 msgstr ""
 
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1965
 msgid "need NEW-VERSION [UPS-COMMITTISH]"
 msgstr ""
 
-#: ../git-debrebase:2041
+#: ../git-debrebase:1970
 #, perl-format
 msgid "bad version number `%s'"
 msgstr ""
 
-#: ../git-debrebase:2059
+#: ../git-debrebase:1988
 #, perl-format
 msgid "upstream piece `%s'"
 msgstr ""
 
-#: ../git-debrebase:2060
+#: ../git-debrebase:1989
 msgid "upstream (main piece"
 msgstr ""
 
-#: ../git-debrebase:2080
+#: ../git-debrebase:2009
 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
 msgstr ""
 
-#: ../git-debrebase:2098
+#: ../git-debrebase:2027
 msgid "old anchor is recognised due to --anchor, cannot check upstream"
 msgstr "old anchor is recognized due to --anchor, cannot check upstream"
 
-#: ../git-debrebase:2114
+#: ../git-debrebase:2043
 #, perl-format
 msgid ""
 "previous upstream combine %s mentions %d pieces (each implying one parent) "
 "but has %d parents (one per piece plus maybe a previous combine)"
 msgstr ""
 
-#: ../git-debrebase:2123
+#: ../git-debrebase:2052
 #, perl-format
 msgid "previous upstream combine %s first piece is not `.'"
 msgstr ""
 
-#: ../git-debrebase:2136
+#: ../git-debrebase:2065
 #, perl-format
 msgid ""
 "previous upstream %s is from git-debrebase but not an `upstream-combine' "
 "commit"
 msgstr ""
 
-#: ../git-debrebase:2147
+#: ../git-debrebase:2076
 #, perl-format
 msgid "introducing upstream piece `%s'"
 msgstr ""
 
-#: ../git-debrebase:2150
+#: ../git-debrebase:2079
 #, perl-format
 msgid "dropping upstream piece `%s'"
 msgstr ""
 
-#: ../git-debrebase:2153
+#: ../git-debrebase:2082
 #, perl-format
 msgid "not fast forward: %s %s"
 msgstr ""
 
-#: ../git-debrebase:2264
+#: ../git-debrebase:2193
 msgid "Previous head already recorded\n"
 msgstr ""
 
-#: ../git-debrebase:2268
+#: ../git-debrebase:2197
 #, perl-format
 msgid "Could not preserve: %s"
 msgstr ""
 
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214
+#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337
+#: ../git-debrebase:2401
 msgid "no arguments allowed"
 msgstr ""
 
-#: ../git-debrebase:2307
+#: ../git-debrebase:2236
 msgid "branch contains furniture (not laundered)"
 msgstr ""
 
-#: ../git-debrebase:2308
+#: ../git-debrebase:2237
 msgid "branch is unlaundered"
 msgstr ""
 
-#: ../git-debrebase:2309
+#: ../git-debrebase:2238
 msgid "branch needs laundering"
 msgstr ""
 
-#: ../git-debrebase:2310
+#: ../git-debrebase:2239
 msgid "branch not in git-debrebase form"
 msgstr ""
 
-#: ../git-debrebase:2320
+#: ../git-debrebase:2249
 msgid "current branch contents, in git-debrebase terms:\n"
 msgstr ""
 
-#: ../git-debrebase:2322
+#: ../git-debrebase:2251
 msgid "  branch is laundered\n"
 msgstr ""
 
-#: ../git-debrebase:2338
+#: ../git-debrebase:2267
 #, perl-format
 msgid "  %s is not well-defined\n"
 msgstr ""
 
-#: ../git-debrebase:2344
+#: ../git-debrebase:2273
 msgid "key git-debrebase commits:\n"
 msgstr ""
 
-#: ../git-debrebase:2345
+#: ../git-debrebase:2274
 msgid "anchor"
 msgstr ""
 
-#: ../git-debrebase:2346
+#: ../git-debrebase:2275
 msgid "breakwater"
 msgstr ""
 
-#: ../git-debrebase:2351
+#: ../git-debrebase:2280
 msgid "branch and ref status, in git-debrebase terms:\n"
 msgstr ""
 
-#: ../git-debrebase:2358
+#: ../git-debrebase:2287
 msgid "  unstitched; previous tip was:\n"
 msgstr ""
 
-#: ../git-debrebase:2361
+#: ../git-debrebase:2290
 msgid "  stitched? (no record of git-debrebase work)\n"
 msgstr ""
 
-#: ../git-debrebase:2363
+#: ../git-debrebase:2292
 msgid "  stitched\n"
 msgstr ""
 
-#: ../git-debrebase:2365
+#: ../git-debrebase:2294
 msgid "  not git-debrebase (diverged since last stitch)\n"
 msgstr ""
 
-#: ../git-debrebase:2368
+#: ../git-debrebase:2297
 msgid "you are currently rebasing\n"
 msgstr ""
 
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2314 ../git-debrebase:2327
 msgid "launder for git-debrebase quick"
 msgstr ""
 
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2321 ../git-debrebase:2351
 msgid "No ongoing git-debrebase session."
 msgstr ""
 
-#: ../git-debrebase:2461
+#: ../git-debrebase:2390
 msgid "Commit patch queue (exported by git-debrebase)"
 msgstr ""
 
-#: ../git-debrebase:2478
+#: ../git-debrebase:2407
 msgid "No (more) patches to export."
 msgstr ""
 
-#: ../git-debrebase:2485
+#: ../git-debrebase:2414
 #, perl-format
 msgid ""
 "Patch export produced patch amendments (abandoned output commit %s).  Try "
 "laundering first."
 msgstr ""
 
-#: ../git-debrebase:2505
+#: ../git-debrebase:2434
 #, perl-format
 msgid "%s contains comments, which will be discarded"
 msgstr ""
 
-#: ../git-debrebase:2510
+#: ../git-debrebase:2439
 #, perl-format
 msgid "patch %s repeated in %s !"
 msgstr ""
 
-#: ../git-debrebase:2517
+#: ../git-debrebase:2446
 #, perl-format
 msgid "Unused patch file %s will be discarded"
 msgstr ""
 
-#: ../git-debrebase:2525
+#: ../git-debrebase:2454
 msgid "ffq-prev exists, this is already managed by git-debrebase!"
 msgstr ""
 
-#: ../git-debrebase:2530
+#: ../git-debrebase:2459
 msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
 msgstr ""
 
-#: ../git-debrebase:2546
+#: ../git-debrebase:2475
 msgid "want only 1 optional argument, the upstream git commitish"
 msgstr ""
 
-#: ../git-debrebase:2551
+#: ../git-debrebase:2480
 msgid "missing Version from changelog\n"
 msgstr ""
 
-#: ../git-debrebase:2567
+#: ../git-debrebase:2496
 #, perl-format
 msgid ""
 "upstream (%s) and HEAD are not\n"
@@ -2540,58 +2206,58 @@ msgid ""
 "  git diff %s HEAD -- :!/debian :/\n"
 msgstr ""
 
-#: ../git-debrebase:2575
+#: ../git-debrebase:2504
 #, perl-format
 msgid "upstream (%s) is not an ancestor of HEAD"
 msgstr ""
 
-#: ../git-debrebase:2582
+#: ../git-debrebase:2511
 #, perl-format
 msgid ""
 "history between upstream (%s) and HEAD contains direct changes to upstream "
 "files - are you sure this is a gbp (patches-unapplied) branch?"
 msgstr ""
 
-#: ../git-debrebase:2584
+#: ../git-debrebase:2513
 #, perl-format
 msgid "list expected changes with:  %s\n"
 msgstr ""
 
-#: ../git-debrebase:2591
+#: ../git-debrebase:2520
 #, perl-format
 msgid "upstream (%s) contains debian/ directory"
 msgstr ""
 
-#: ../git-debrebase:2609
+#: ../git-debrebase:2538
 msgid "neither of the first two changelog entries are released\n"
 msgstr ""
 
-#: ../git-debrebase:2615
+#: ../git-debrebase:2544
 #, perl-format
 msgid "could not find suitable maintainer view tag %s\n"
 msgstr ""
 
-#: ../git-debrebase:2618
+#: ../git-debrebase:2547
 #, perl-format
 msgid "HEAD is not FF from maintainer tag %s!"
 msgstr ""
 
-#: ../git-debrebase:2621
+#: ../git-debrebase:2550
 #, perl-format
 msgid "dgit view tag %s not found\n"
 msgstr ""
 
-#: ../git-debrebase:2623
+#: ../git-debrebase:2552
 #, perl-format
 msgid "dgit view tag %s is not FF from maintainer tag %s\n"
 msgstr ""
 
-#: ../git-debrebase:2625
+#: ../git-debrebase:2554
 #, perl-format
 msgid "will stitch in dgit view, %s\n"
 msgstr ""
 
-#: ../git-debrebase:2632
+#: ../git-debrebase:2561
 #, perl-format
 msgid ""
 "Cannot confirm dgit view: %s\n"
@@ -2599,12 +2265,12 @@ msgid ""
 "dgit --overwrite will be needed on the first dgit push after conversion.\n"
 msgstr ""
 
-#: ../git-debrebase:2678
+#: ../git-debrebase:2607
 #, perl-format
 msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
 msgstr ""
 
-#: ../git-debrebase:2707
+#: ../git-debrebase:2636
 #, perl-format
 msgid ""
 "%s: converted to git-buildpackage branch format\n"
@@ -2612,16 +2278,16 @@ msgid ""
 "%s: WARNING: doing so would drop all upstream patches!\n"
 msgstr ""
 
-#: ../git-debrebase:2728
+#: ../git-debrebase:2657
 msgid "takes 1 optional argument, the upstream commitish"
 msgstr ""
 
-#: ../git-debrebase:2736
+#: ../git-debrebase:2665
 #, perl-format
 msgid "%s, from command line"
 msgstr ""
 
-#: ../git-debrebase:2750
+#: ../git-debrebase:2679
 #, perl-format
 msgid ""
 "%s: Branch already seems to be in git-debrebase format!\n"
@@ -2629,225 +2295,242 @@ msgid ""
 "%s: but is probably a bad idea.  Probably, you wanted to do nothing.\n"
 msgstr ""
 
-#: ../git-debrebase:2754
+#: ../git-debrebase:2683
 msgid "Branch already in git-debrebase format."
 msgstr ""
 
-#: ../git-debrebase:2766
+#: ../git-debrebase:2695
 msgid "Considering possible commits corresponding to upstream:\n"
 msgstr ""
 
-#: ../git-debrebase:2773
+#: ../git-debrebase:2702
 #, perl-format
 msgid "git tag %s"
 msgstr ""
 
-#: ../git-debrebase:2779
+#: ../git-debrebase:2708
 #, perl-format
 msgid " git tag: no suitable tag found (tried %s)\n"
 msgstr ""
 
-#: ../git-debrebase:2788
+#: ../git-debrebase:2717
 #, perl-format
 msgid "opendir build-products-dir %s: %s"
 msgstr ""
 
-#: ../git-debrebase:2794
+#: ../git-debrebase:2723
 #, perl-format
 msgid " orig: found what looks like a .orig, %s\n"
 msgstr ""
 
-#: ../git-debrebase:2825
+#: ../git-debrebase:2754
 #, perl-format
 msgid " orig: no suitable origs found (looked for %s in %s)\n"
 msgstr ""
 
-#: ../git-debrebase:2834
+#: ../git-debrebase:2763
 msgid "Evaluating possible commits corresponding to upstream:\n"
 msgstr ""
 
-#: ../git-debrebase:2871
+#: ../git-debrebase:2800
 #, perl-format
 msgid " %s: couldn't apply patches: gbp pq %s"
 msgstr ""
 
-#: ../git-debrebase:2880
+#: ../git-debrebase:2809
 #, perl-format
 msgid " %s: applying patches gives different tree\n"
 msgstr ""
 
-#: ../git-debrebase:2894
+#: ../git-debrebase:2823
 msgid ""
 "Could not find or construct a suitable upstream commit.\n"
 "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
 "upstream commmit explicitly or provide suitable origs.\n"
 msgstr ""
 
-#: ../git-debrebase:2900
+#: ../git-debrebase:2829
 #, perl-format
 msgid "Yes, will base new branch on %s\n"
 msgstr ""
 
-#: ../git-debrebase:2907
+#: ../git-debrebase:2836
 msgid "forget-was-ever-debrebase takes no further arguments"
 msgstr ""
 
-#: ../git-debrebase:2911
+#: ../git-debrebase:2840
 #, perl-format
 msgid "Not suitable for recording git-debrebaseness anyway: %s"
 msgstr ""
 
-#: ../git-debrebase:3013
+#: ../git-debrebase:2942
 msgid "bad options\n"
 msgstr ""
 
-#: ../git-debrebase:3023
+#: ../git-debrebase:2952
 #, perl-format
 msgid "%s: no cuddling to -i for git-rebase"
 msgstr ""
 
-#: ../git-debrebase:3053
+#: ../git-debrebase:2982
 #, perl-format
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:298
 #, perl-format
 msgid "error: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:324
 #, perl-format
 msgid "getcwd failed: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:343
 msgid "terminated, reporting successful completion"
 msgstr ""
 
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:345
 #, perl-format
 msgid "failed with error exit status %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:348
 #, perl-format
 msgid "died due to fatal signal %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:352
 #, perl-format
 msgid "failed with unknown wait status %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:358
 msgid "failed command"
 msgstr ""
 
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:364
 #, perl-format
 msgid "failed to fork/exec: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:366
 #, perl-format
 msgid "subprocess %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:368
 msgid "subprocess produced invalid output"
 msgstr ""
 
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:459
 msgid "stat source file: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:469
 msgid "stat destination file: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:488
 msgid "finally install file after cp: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:494
 msgid "delete old file after cp: %S"
 msgstr ""
 
-#: ../Debian/Dgit.pm:506
+#: ../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:509
+#: ../Debian/Dgit.pm:518
 #, perl-format
 msgid "chdir toplevel %s: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:626
 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:627
 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:649
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:655
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:769
 msgid "detached HEAD"
 msgstr ""
 
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:770
 msgid "HEAD symref is not to refs/"
 msgstr ""
 
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:786
 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 
-#: ../Debian/Dgit.pm:715
+#: ../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:729
+#: ../Debian/Dgit.pm:809
 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:830
 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:916
 msgid "Dummy commit - do not use\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:937
 #, perl-format
 msgid "exec %s: %s\n"
 msgstr ""
 
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1005
 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1028
 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1036
 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1045
 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""