dgit clone: No longer create an "origin" remote

[dgit.git] / po / en_US.po

diff --git a/po/en_US.po b/po/en_US.po
index 0e4ddfbcf19a568d489d22cafafc76423ed8e7f6..e8cd03f5236292e0c30a8f56bbba400db51a0d6e 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: dgit ongoing\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2019-01-06 17:50+0000\n"
+"POT-Creation-Date: 2019-07-21 00:36+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"
 "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,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: ../dgit:240
+#: ../dgit:264

 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: invalid configuration: %s\n"
 msgstr ""
 

-#: ../dgit:247
+#: ../dgit:271

 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 
 msgid "warning: overriding problem due to --force:\n"
 msgstr ""
 

-#: ../dgit:255
+#: ../dgit:279

 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: skipping checks or functionality due to --force-%s\n"
 msgstr ""
 

-#: ../dgit:260
+#: ../dgit:284

 #, perl-format
 msgid "%s: source package %s does not exist in suite %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: source package %s does not exist in suite %s\n"
 msgstr ""
 

-#: ../dgit:483
+#: ../dgit:516

 #, perl-format
 msgid "build host child %s"
 msgstr ""
 
 #, perl-format
 msgid "build host child %s"
 msgstr ""
 

-#: ../dgit:488 ../dgit:494
+#: ../dgit:521 ../dgit:527

 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 
 #, perl-format
 msgid "connection lost: %s"
 msgstr ""
 

-#: ../dgit:489
+#: ../dgit:522

 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 
 #, perl-format
 msgid "protocol violation; %s not expected"
 msgstr ""
 

-#: ../dgit:497
+#: ../dgit:530

 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 
 #, perl-format
 msgid "eof (reading %s)"
 msgstr ""
 

-#: ../dgit:504
+#: ../dgit:537

 msgid "protocol message"
 msgstr ""
 
 msgid "protocol message"
 msgstr ""
 

-#: ../dgit:512
+#: ../dgit:545

 #, perl-format
 msgid "`%s'"
 msgstr ""
 
 #, perl-format
 msgid "`%s'"
 msgstr ""
 

-#: ../dgit:533
+#: ../dgit:566

 msgid "bad byte count"
 msgstr ""
 
 msgid "bad byte count"
 msgstr ""
 

-#: ../dgit:536
+#: ../dgit:569

 msgid "data block"
 msgstr ""
 
 msgid "data block"
 msgstr ""
 

-#: ../dgit:617
+#: ../dgit:650

 #, perl-format
 msgid "failed to fetch %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to fetch %s: %s"
 msgstr ""
 

-#: ../dgit:629
+#: ../dgit:662

 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 
 #, perl-format
 msgid "%s ok: %s"
 msgstr ""
 

-#: ../dgit:631
+#: ../dgit:664

 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 
 #, perl-format
 msgid "would be ok: %s (but dry run only)"
 msgstr ""
 

-#: ../dgit:656
+#: ../dgit:689

 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
 msgid ""
 "main usages:\n"
 "  dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"


@@ -109,141 +109,153 @@ msgid ""
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 
 "  -c<name>=<value>    set git config option (used directly by dgit too)\n"
 msgstr ""
 

-#: ../dgit:675
+#: ../dgit:708

 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 
 msgid "Perhaps the upload is stuck in incoming.  Using the version from git.\n"
 msgstr ""
 

-#: ../dgit:679
+#: ../dgit:712

 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 
 #, perl-format
 msgid ""
 "%s: %s\n"
 "%s"
 msgstr ""
 

-#: ../dgit:684
+#: ../dgit:717

 msgid "too few arguments"
 msgstr ""
 
 msgid "too few arguments"
 msgstr ""
 

-#: ../dgit:795
+#: ../dgit:833

 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 
 #, perl-format
 msgid "multiple values for %s (in %s git config)"
 msgstr ""
 

-#: ../dgit:798
+#: ../dgit:836

 #, perl-format
 msgid "value for config option %s (in %s git config) contains newline(s)!"
 msgstr ""
 
 #, perl-format
 msgid "value for config option %s (in %s git config) contains newline(s)!"
 msgstr ""
 

-#: ../dgit:818
+#: ../dgit:856

 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 
 #, perl-format
 msgid ""
 "need value for one of: %s\n"
 "%s: distro or suite appears not to be (properly) supported"
 msgstr ""
 

-#: ../dgit:859
+#: ../dgit:897

 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 
 #, perl-format
 msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
 msgstr ""
 

-#: ../dgit:874
+#: ../dgit:912

 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 
 #, perl-format
 msgid "backports-quirk needs % or ( )"
 msgstr ""
 

-#: ../dgit:890
+#: ../dgit:928

 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 
 #, perl-format
 msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
 msgstr ""
 

-#: ../dgit:910
+#: ../dgit:948

 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 
 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
 msgstr ""
 

-#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:966
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206

 msgid "internal error"
 msgstr ""
 
 msgid "internal error"
 msgstr ""
 

-#: ../dgit:921
+#: ../dgit:973

 msgid "pushing but distro is configured readonly"
 msgstr ""
 
 msgid "pushing but distro is configured readonly"
 msgstr ""
 

-#: ../dgit:925
+#: ../dgit:977

 msgid ""
 "Push failed, before we got started.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 
 msgid ""
 "Push failed, before we got started.\n"
 "You can retry the push, after fixing the problem, if you like.\n"
 msgstr ""
 

-#: ../dgit:1090
+#: ../dgit:1000
+#, perl-format
+msgid ""
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
+msgstr ""
+
+#: ../dgit:1163

 msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 
 msgid "this operation does not support multiple comma-separated suites"
 msgstr ""
 

-#: ../dgit:1136
+#: ../dgit:1209

 #, perl-format
 msgid ""
 "config requested specific TLS key but do not know how to get curl to use "
 "exactly that EE key (%s)"
 msgstr ""
 
 #, perl-format
 msgid ""
 "config requested specific TLS key but do not know how to get curl to use "
 "exactly that EE key (%s)"
 msgstr ""
 

-#: ../dgit:1157
+#: ../dgit:1230

 msgid "ftpmasterapi archive query method takes no data part"
 msgstr ""
 
 msgid "ftpmasterapi archive query method takes no data part"
 msgstr ""
 

-#: ../dgit:1165
+#: ../dgit:1238

 msgid "curl failed to print 3-digit HTTP code"
 msgstr ""
 
 msgid "curl failed to print 3-digit HTTP code"
 msgstr ""
 

-#: ../dgit:1169
+#: ../dgit:1242

 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 
 #, perl-format
 msgid "fetch of %s gave HTTP code %s"
 msgstr ""
 

-#: ../dgit:1185
+#: ../dgit:1258

 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 
 #, perl-format
 msgid "unknown suite %s, maybe -d would help"
 msgstr ""
 

-#: ../dgit:1189
+#: ../dgit:1262

 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 
 #, perl-format
 msgid "multiple matches for suite %s\n"
 msgstr ""
 

-#: ../dgit:1191
+#: ../dgit:1264

 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 
 #, perl-format
 msgid "suite %s info has no codename\n"
 msgstr ""
 

-#: ../dgit:1193
+#: ../dgit:1266

 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 
 #, perl-format
 msgid "suite %s maps to bad codename\n"
 msgstr ""
 

-#: ../dgit:1195 ../dgit:1220
+#: ../dgit:1268 ../dgit:1293

 msgid "bad ftpmaster api response: "
 msgstr ""
 
 msgid "bad ftpmaster api response: "
 msgstr ""
 

-#: ../dgit:1209
+#: ../dgit:1282

 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "bad version: %s\n"
 msgstr ""
 

-#: ../dgit:1211
+#: ../dgit:1284

 msgid "bad component"
 msgstr ""
 
 msgid "bad component"
 msgstr ""
 

-#: ../dgit:1214
+#: ../dgit:1287

 msgid "bad filename"
 msgstr ""
 
 msgid "bad filename"
 msgstr ""
 

-#: ../dgit:1216
+#: ../dgit:1289

 msgid "bad sha256sum"
 msgstr ""
 
 msgid "bad sha256sum"
 msgstr ""
 

-#: ../dgit:1267
+#: ../dgit:1340

 msgid "aptget archive query method takes no data part"
 msgstr ""
 
 msgid "aptget archive query method takes no data part"
 msgstr ""
 

-#: ../dgit:1351
+#: ../dgit:1424

 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"
 #, perl-format
 msgid ""
 "apt seemed to not to update dgit's cached Release files for %s.\n"


@@ -251,163 +263,163 @@ msgid ""
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 
 " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
 msgstr ""
 

-#: ../dgit:1373
+#: ../dgit:1448

 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 
 #, perl-format
 msgid "Release file (%s) specifies intolerable %s"
 msgstr ""
 

-#: ../dgit:1401
+#: ../dgit:1474

 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 
 msgid "apt-get source did not produce a .dsc"
 msgstr ""
 

-#: ../dgit:1402
+#: ../dgit:1475

 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 
 #, perl-format
 msgid "apt-get source produced several .dscs (%s)"
 msgstr ""
 

-#: ../dgit:1507
+#: ../dgit:1580

 #, perl-format
 msgid ""
 "unable to canonicalise suite using package %s which does not appear to exist "
 "in suite %s; --existing-package may help"
 msgstr ""
 
 #, 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:1698
+#: ../dgit:1719

 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 
 #, perl-format
 msgid "cannot operate on %s suite"
 msgstr ""
 

-#: ../dgit:1701
+#: ../dgit:1722

 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 
 #, perl-format
 msgid "canonical suite name for %s is %s"
 msgstr ""
 

-#: ../dgit:1703
+#: ../dgit:1724

 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 
 #, perl-format
 msgid "canonical suite name is %s"
 msgstr ""
 

-#: ../dgit:1723
+#: ../dgit:1744

 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 
 #, perl-format
 msgid "%s has hash %s but archive told us to expect %s"
 msgstr ""
 

-#: ../dgit:1729
+#: ../dgit:1750

 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 
 #, perl-format
 msgid "unsupported source format %s, sorry"
 msgstr ""
 

-#: ../dgit:1756
+#: ../dgit:1777

 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 
 #, perl-format
 msgid "diverting to %s (using config for %s)"
 msgstr ""
 

-#: ../dgit:1773
+#: ../dgit:1794

 msgid "unexpected results from git check query - "
 msgstr ""
 
 msgid "unexpected results from git check query - "
 msgstr ""
 

-#: ../dgit:1788
+#: ../dgit:1809

 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown git-check `%s'"
 msgstr ""
 

-#: ../dgit:1803
+#: ../dgit:1824

 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown git-create `%s'"
 msgstr ""
 

-#: ../dgit:1840
+#: ../dgit:1861

 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: warning: removing from %s: %s\n"
 msgstr ""
 

-#: ../dgit:1886
+#: ../dgit:1907

 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 
 #, perl-format
 msgid "could not parse .dsc %s line `%s'"
 msgstr ""
 

-#: ../dgit:1897
+#: ../dgit:1918

 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 
 #, perl-format
 msgid "missing any supported Checksums-* or Files field in %s"
 msgstr ""
 

-#: ../dgit:1943
+#: ../dgit:1964

 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 
 #, perl-format
 msgid "hash or size of %s varies in %s fields (between: %s)"
 msgstr ""
 

-#: ../dgit:1952
+#: ../dgit:1973

 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 
 #, perl-format
 msgid "file list in %s varies between hash fields!"
 msgstr ""
 

-#: ../dgit:1956
+#: ../dgit:1977

 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 
 #, perl-format
 msgid "%s has no files list field(s)"
 msgstr ""
 

-#: ../dgit:1962
+#: ../dgit:1983

 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 
 #, perl-format
 msgid "no file appears in all file lists (looked in: %s)"
 msgstr ""
 

-#: ../dgit:2002
+#: ../dgit:2023

 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 
 #, perl-format
 msgid "purportedly source-only changes polluted by %s\n"
 msgstr ""
 

-#: ../dgit:2015
+#: ../dgit:2036

 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 
 msgid "cannot find section/priority from .changes Files field"
 msgstr ""
 

-#: ../dgit:2028
+#: ../dgit:2049

 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 
 msgid ""
 "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
 msgstr ""
 

-#: ../dgit:2044
+#: ../dgit:2065

 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 
 #, perl-format
 msgid ".dsc %s missing entry for %s"
 msgstr ""
 

-#: ../dgit:2049
+#: ../dgit:2070

 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 
 #, perl-format
 msgid "%s: %s (archive) != %s (local .dsc)"
 msgstr ""
 

-#: ../dgit:2057
+#: ../dgit:2078

 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "archive %s: %s"
 msgstr ""
 

-#: ../dgit:2064
+#: ../dgit:2085

 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 
 #, perl-format
 msgid "archive contains %s with different checksum"
 msgstr ""
 

-#: ../dgit:2092
+#: ../dgit:2113

 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 
 #, perl-format
 msgid "edited .changes for archive .orig contents: %s %s"
 msgstr ""
 

-#: ../dgit:2100
+#: ../dgit:2121

 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 
 #, perl-format
 msgid "[new .changes left in %s]"
 msgstr ""
 

-#: ../dgit:2103
+#: ../dgit:2124

 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 
 #, perl-format
 msgid "%s already has appropriate .orig(s) (if any)"
 msgstr ""
 

-#: ../dgit:2127
+#: ../dgit:2143

 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 
 #, perl-format
 msgid ""
 "unexpected commit author line format `%s' (was generated from changelog "
 "Maintainer field)"
 msgstr ""
 

-#: ../dgit:2150
+#: ../dgit:2166

 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"
 msgid ""
 "\n"
 "Unfortunately, this source package uses a feature of dpkg-source where\n"


@@ -422,113 +434,108 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:2162
+#: ../dgit:2178

 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 
 #, perl-format
 msgid ""
 "Found active distro-specific series file for %s (%s): %s, cannot continue"
 msgstr ""
 

-#: ../dgit:2193
+#: ../dgit:2209

 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 
 msgid "Dpkg::Vendor `current vendor'"
 msgstr ""
 

-#: ../dgit:2195
+#: ../dgit:2211

 msgid "(base) distro being accessed"
 msgstr ""
 
 msgid "(base) distro being accessed"
 msgstr ""
 

-#: ../dgit:2197
+#: ../dgit:2213

 msgid "(nominal) distro being accessed"
 msgstr ""
 
 msgid "(nominal) distro being accessed"
 msgstr ""
 

-#: ../dgit:2202
+#: ../dgit:2218

 #, perl-format
 msgid "build-products-dir %s is not accessible: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "build-products-dir %s is not accessible: %s\n"
 msgstr ""
 

-#: ../dgit:2227
+#: ../dgit:2243

 #, perl-format
 msgid ""
 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
 msgstr ""
 

-#: ../dgit:2231
+#: ../dgit:2247

 #, perl-format
 msgid "check orig file %s in bpd %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "check orig file %s in bpd %s: %s"
 msgstr ""
 

-#: ../dgit:2233
+#: ../dgit:2249

 #, perl-format
 msgid "check orig file %s in ..: %s"
 msgstr ""
 
 #, perl-format
 msgid "check orig file %s in ..: %s"
 msgstr ""
 

-#: ../dgit:2236
+#: ../dgit:2252

 #, perl-format
 #, perl-format

-msgid "check targe of orig symlink %s in ..: %s"
+msgid "check target of orig symlink %s in ..: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../dgit:2245
+#: ../dgit:2261

 #, perl-format
 msgid "%s: cloned orig symlink from ..: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: cloned orig symlink from ..: %s\n"
 msgstr ""
 

-#: ../dgit:2249
+#: ../dgit:2265

 #, perl-format
 msgid "%s: hardlinked orig from ..: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: hardlinked orig from ..: %s\n"
 msgstr ""
 

-#: ../dgit:2252
+#: ../dgit:2268

 #, perl-format
 msgid "failed to make %s a hardlink to %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to make %s a hardlink to %s: %s"
 msgstr ""
 

-#: ../dgit:2258
+#: ../dgit:2274

 #, perl-format
 msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
 msgstr ""
 

-#: ../dgit:2290 ../dgit:2295
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2310 ../dgit:2317
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2382
+#: ../dgit:2345

 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "dgit (child): exec %s: %s"
 msgstr ""
 

-#: ../dgit:2446 ../dgit:5970
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2464
+#: ../dgit:2407

 msgid "package changelog"
 msgstr ""
 
 msgid "package changelog"
 msgstr ""
 

-#: ../dgit:2504
+#: ../dgit:2447

 msgid "package changelog has no entries!"
 msgstr ""
 
 msgid "package changelog has no entries!"
 msgstr ""
 

-#: ../dgit:2523
+#: ../dgit:2516 ../dgit:2521
+#, perl-format
+msgid "accessing %s: %s"
+msgstr ""
+
+#: ../dgit:2536 ../dgit:2543

 #, perl-format
 #, perl-format

-msgid "Import %s"
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2569 ../dgit:6035
+msgid "source package"

 msgstr ""
 
 msgstr ""
 

-#: ../dgit:2604
+#: ../dgit:2647

 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 
 #, perl-format
 msgid "%s: trying slow absurd-git-apply..."
 msgstr ""
 

-#: ../dgit:2623
+#: ../dgit:2666

 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s failed: %s\n"
 msgstr ""
 

-#: ../dgit:2632
+#: ../dgit:2675

 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"
 #, perl-format
 msgid ""
 "gbp-pq import and dpkg-source disagree!\n"


@@ -537,21 +544,16 @@ msgid ""
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 
 " dpkg-source --before-build gave tree %s\n"
 msgstr ""
 

-#: ../dgit:2647
+#: ../dgit:2690

 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 
 #, perl-format
 msgid "synthesised git commit from .dsc %s"
 msgstr ""
 

-#: ../dgit:2651
+#: ../dgit:2694

 msgid "Import of source package"
 msgstr ""
 
 msgid "Import of source package"
 msgstr ""
 

-#: ../dgit:2664
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2668
+#: ../dgit:2714

 #, perl-format
 msgid ""
 "\n"
 #, perl-format
 msgid ""
 "\n"


@@ -560,51 +562,51 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: ../dgit:2710
+#: ../dgit:2756

 #, perl-format
 msgid "using existing %s"
 msgstr ""
 
 #, perl-format
 msgid "using existing %s"
 msgstr ""
 

-#: ../dgit:2714
+#: ../dgit:2760

 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
 "file?)"
 msgstr ""
 

-#: ../dgit:2718
+#: ../dgit:2764

 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 
 #, perl-format
 msgid "need to fetch correct version of %s"
 msgstr ""
 

-#: ../dgit:2734
+#: ../dgit:2780

 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 
 #, perl-format
 msgid ""
 "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
 msgstr ""
 

-#: ../dgit:2829
+#: ../dgit:2875

 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 
 msgid "too many iterations trying to get sane fetch!"
 msgstr ""
 

-#: ../dgit:2844
+#: ../dgit:2890

 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
 msgstr ""
 

-#: ../dgit:2888
+#: ../dgit:2934

 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 
 #, perl-format
 msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
 msgstr ""
 

-#: ../dgit:2903
+#: ../dgit:2949

 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 ""
 
 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:2908
+#: ../dgit:2954

 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"
 #, perl-format
 msgid ""
 "warning: git ls-remote suggests we want %s\n"


@@ -614,49 +616,24 @@ msgid ""
 "warning:  Will try again...\n"
 msgstr ""
 
 "warning:  Will try again...\n"
 msgstr ""
 

-#: ../dgit:2975
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3024
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3035
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3037
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3059
+#: ../dgit:3101

 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 
 #, perl-format
 msgid "not chasing .dsc distro %s: not fetching %s"
 msgstr ""
 

-#: ../dgit:3064
+#: ../dgit:3106

 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 
 #, perl-format
 msgid ".dsc names distro %s: fetching %s"
 msgstr ""
 

-#: ../dgit:3069
+#: ../dgit:3111

 #, 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 ""
 
 #, 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:3079
+#: ../dgit:3121

 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"
 #, perl-format
 msgid ""
 ".dsc Dgit metadata is in context of distro %s\n"


@@ -665,54 +642,54 @@ msgid ""
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 
 "(can be overridden by config - consult documentation)\n"
 msgstr ""
 

-#: ../dgit:3099
+#: ../dgit:3141

 msgid "rewrite map"
 msgstr ""
 
 msgid "rewrite map"
 msgstr ""
 

-#: ../dgit:3106
+#: ../dgit:3148

 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 
 msgid "server's git history rewrite map contains a relevant entry!"
 msgstr ""
 

-#: ../dgit:3110
+#: ../dgit:3152

 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 
 msgid "using rewritten git hash in place of .dsc value"
 msgstr ""
 

-#: ../dgit:3112
+#: ../dgit:3154

 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 
 msgid "server data says .dsc hash is to be disregarded"
 msgstr ""
 

-#: ../dgit:3119
+#: ../dgit:3161

 msgid "additional commits"
 msgstr ""
 
 msgid "additional commits"
 msgstr ""
 

-#: ../dgit:3122
+#: ../dgit:3164

 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 ".dsc Dgit metadata requires commit %s\n"
 "but we could not obtain that object anywhere.\n"
 msgstr ""
 

-#: ../dgit:3147
+#: ../dgit:3189

 msgid "last upload to archive"
 msgstr ""
 
 msgid "last upload to archive"
 msgstr ""
 

-#: ../dgit:3151
+#: ../dgit:3193

 msgid "no version available from the archive"
 msgstr ""
 
 msgid "no version available from the archive"
 msgstr ""
 

-#: ../dgit:3234
+#: ../dgit:3276

 msgid "dgit suite branch on dgit git server"
 msgstr ""
 
 msgid "dgit suite branch on dgit git server"
 msgstr ""
 

-#: ../dgit:3241
+#: ../dgit:3283

 msgid "dgit client's archive history view"
 msgstr ""
 
 msgid "dgit client's archive history view"
 msgstr ""
 

-#: ../dgit:3246
+#: ../dgit:3288

 msgid "Dgit field in .dsc from archive"
 msgstr ""
 
 msgid "Dgit field in .dsc from archive"
 msgstr ""
 

-#: ../dgit:3274
+#: ../dgit:3316

 #, perl-format
 msgid ""
 "\n"
 #, perl-format
 msgid ""
 "\n"


@@ -722,15 +699,15 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: ../dgit:3287
+#: ../dgit:3329

 msgid "archive .dsc names newer git commit"
 msgstr ""
 
 msgid "archive .dsc names newer git commit"
 msgstr ""
 

-#: ../dgit:3290
+#: ../dgit:3332

 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 
 msgid "archive .dsc names other git commit, fixing up"
 msgstr ""
 

-#: ../dgit:3311
+#: ../dgit:3353

 #, perl-format
 msgid ""
 "\n"
 #, perl-format
 msgid ""
 "\n"


@@ -738,7 +715,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: ../dgit:3320
+#: ../dgit:3362

 #, perl-format
 msgid ""
 "\n"
 #, perl-format
 msgid ""
 "\n"


@@ -748,7 +725,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:3405
+#: ../dgit:3447

 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"
 #, perl-format
 msgid ""
 "Record %s (%s) in archive suite %s\n"


@@ -756,19 +733,19 @@ msgid ""
 "Record that\n"
 msgstr ""
 
 "Record that\n"
 msgstr ""
 

-#: ../dgit:3418
+#: ../dgit:3460

 msgid "should be treated as descended from\n"
 msgstr ""
 
 msgid "should be treated as descended from\n"
 msgstr ""
 

-#: ../dgit:3436
+#: ../dgit:3478

 msgid "dgit repo server tip (last push)"
 msgstr ""
 
 msgid "dgit repo server tip (last push)"
 msgstr ""
 

-#: ../dgit:3438
+#: ../dgit:3480

 msgid "local tracking tip (last fetch)"
 msgstr ""
 
 msgid "local tracking tip (last fetch)"
 msgstr ""
 

-#: ../dgit:3449
+#: ../dgit:3491

 #, perl-format
 msgid ""
 "\n"
 #, perl-format
 msgid ""
 "\n"


@@ -778,30 +755,30 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:3464
+#: ../dgit:3506

 msgid "fetched source tree"
 msgstr ""
 
 msgid "fetched source tree"
 msgstr ""
 

-#: ../dgit:3500
+#: ../dgit:3542

 msgid "debian/changelog merge driver"
 msgstr ""
 
 msgid "debian/changelog merge driver"
 msgstr ""
 

-#: ../dgit:3565
+#: ../dgit:3607

 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 
 msgid ""
 "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
 " not doing further gitattributes setup\n"
 msgstr ""
 

-#: ../dgit:3579
+#: ../dgit:3621

 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 
 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
 msgstr ""
 

-#: ../dgit:3594
+#: ../dgit:3636

 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "install %s: %s"
 msgstr ""
 

-#: ../dgit:3621
+#: ../dgit:3663

 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"
 #, perl-format
 msgid ""
 "dgit: warning: %s contains .gitattributes\n"


@@ -809,30 +786,30 @@ msgid ""
 "tree.\n"
 msgstr ""
 
 "tree.\n"
 msgstr ""
 

-#: ../dgit:3643
+#: ../dgit:3685

 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 
 #, perl-format
 msgid "fetching %s..."
 msgstr ""
 

-#: ../dgit:3651
+#: ../dgit:3693

 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to obtain %s: %s"
 msgstr ""
 

-#: ../dgit:3690
+#: ../dgit:3732

 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 
 #, perl-format
 msgid "package %s missing in (base suite) %s"
 msgstr ""
 

-#: ../dgit:3722
+#: ../dgit:3764

 msgid "local combined tracking branch"
 msgstr ""
 
 msgid "local combined tracking branch"
 msgstr ""
 

-#: ../dgit:3724
+#: ../dgit:3766

 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 
 msgid "archive seems to have rewound: local tracking branch is ahead!"
 msgstr ""
 

-#: ../dgit:3763
+#: ../dgit:3805

 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"
 #, perl-format
 msgid ""
 "Combine archive branches %s [dgit]\n"


@@ -840,7 +817,7 @@ msgid ""
 "Input branches:\n"
 msgstr ""
 
 "Input branches:\n"
 msgstr ""
 

-#: ../dgit:3777
+#: ../dgit:3819

 msgid ""
 "\n"
 "Key\n"
 msgid ""
 "\n"
 "Key\n"


@@ -849,613 +826,257 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:3792
+#: ../dgit:3834

 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 
 #, perl-format
 msgid "calculated combined tracking suite %s"
 msgstr ""
 

-#: ../dgit:3810
+#: ../dgit:3852

 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 
 #, perl-format
 msgid "ready for work in %s"
 msgstr ""
 

-#: ../dgit:3818
+#: ../dgit:3860

 msgid "dry run makes no sense with clone"
 msgstr ""
 
 msgid "dry run makes no sense with clone"
 msgstr ""
 

-#: ../dgit:3833
+#: ../dgit:3875

 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 
 #, perl-format
 msgid "create `%s': %s"
 msgstr ""
 

-#: ../dgit:3849
+#: ../dgit:3891

 msgid "fetching existing git history"
 msgstr ""
 
 msgid "fetching existing git history"
 msgstr ""
 

-#: ../dgit:3853
+#: ../dgit:3895

 msgid "starting new git history"
 msgstr ""
 
 msgid "starting new git history"
 msgstr ""
 

-#: ../dgit:3879
+#: ../dgit:3921

 #, 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 ""
 
 #, 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:3884
+#: ../dgit:3926

 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 
 #, perl-format
 msgid "fetched into %s"
 msgstr ""
 

-#: ../dgit:3896
+#: ../dgit:3938

 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 
 #, perl-format
 msgid "Merge from %s [dgit]"
 msgstr ""
 

-#: ../dgit:3898
+#: ../dgit:3940

 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 
 #, perl-format
 msgid "fetched to %s and merged into HEAD"
 msgstr ""
 

-#: ../dgit:3906
+#: ../dgit:3948

 #, perl-format
 msgid "git tree contains %s"
 msgstr ""
 
 #, perl-format
 msgid "git tree contains %s"
 msgstr ""
 

-#: ../dgit:3917
+#: ../dgit:3959

 msgid "you have uncommitted changes to critical files, cannot continue:\n"
 msgstr ""
 
 msgid "you have uncommitted changes to critical files, cannot continue:\n"
 msgstr ""
 

-#: ../dgit:3936
+#: ../dgit:3978

 #, perl-format
 msgid ""
 "quilt fixup required but quilt mode is `nofix'\n"
 "HEAD commit%s differs from tree implied by debian/patches%s"
 msgstr ""
 
 #, 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:3953
+#: ../dgit:3995

 msgid "nothing quilty to commit, ok."
 msgstr ""
 
 msgid "nothing quilty to commit, ok."
 msgstr ""
 

-#: ../dgit:3956
+#: ../dgit:3998

 msgid " (wanted to commit patch update)"
 msgstr ""
 
 msgid " (wanted to commit patch update)"
 msgstr ""
 

-#: ../dgit:3960
+#: ../dgit:4002

 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 
 msgid ""
 "Commit Debian 3.0 (quilt) metadata\n"
 "\n"
 msgstr ""
 

-#: ../dgit:4003
+#: ../dgit:4045

 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 
 #, perl-format
 msgid ""
 "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
 msgstr ""
 

-#: ../dgit:4008
+#: ../dgit:4050

 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 
 #, perl-format
 msgid "Format `%s', need to check/update patch stack"
 msgstr ""
 

-#: ../dgit:4018
+#: ../dgit:4060

 #, perl-format
 msgid "commit id %s"
 msgstr ""
 
 #, perl-format
 msgid "commit id %s"
 msgstr ""
 

-#: ../dgit:4024
+#: ../dgit:4066

 #, perl-format
 msgid "and left in %s"
 msgstr ""
 
 #, perl-format
 msgid "and left in %s"
 msgstr ""
 

-#: ../dgit:4050
+#: ../dgit:4092

 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 
 #, perl-format
 msgid "Wanted tag %s (%s) on dgit server, but not found\n"
 msgstr ""
 

-#: ../dgit:4053
+#: ../dgit:4095

 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 
 #, perl-format
 msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
 msgstr ""
 

-#: ../dgit:4061
+#: ../dgit:4103

 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 
 #, perl-format
 msgid "%s (%s) .. %s (%s) is not fast forward\n"
 msgstr ""
 

-#: ../dgit:4070
+#: ../dgit:4112

 msgid "version currently in archive"
 msgstr ""
 
 msgid "version currently in archive"
 msgstr ""
 

-#: ../dgit:4079
+#: ../dgit:4121

 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 
 #, perl-format
 msgid "Checking package changelog for archive version %s ..."
 msgstr ""
 

-#: ../dgit:4087
+#: ../dgit:4129

 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 
 #, perl-format
 msgid "%s field from dpkg-parsechangelog %s"
 msgstr ""
 

-#: ../dgit:4097
+#: ../dgit:4140

 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 
 #, perl-format
 msgid "Perhaps debian/changelog does not mention %s ?"
 msgstr ""
 

-#: ../dgit:4100
+#: ../dgit:4143

 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "%s is %s\n"
 "Your tree seems to based on earlier (not uploaded) %s.\n"
 msgstr ""
 

-#: ../dgit:4114
+#: ../dgit:4157

 #, perl-format
 msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 
 #, perl-format
 msgid "Declaring that HEAD includes all changes in %s..."
 msgstr ""
 

-#: ../dgit:4170
+#: ../dgit:4213

 msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 
 msgid "Checking that HEAD includes all changes in archive..."
 msgstr ""
 

-#: ../dgit:4179
+#: ../dgit:4222

 msgid "maintainer view tag"
 msgstr ""
 
 msgid "maintainer view tag"
 msgstr ""
 

-#: ../dgit:4181
+#: ../dgit:4224

 msgid "dgit view tag"
 msgstr ""
 
 msgid "dgit view tag"
 msgstr ""
 

-#: ../dgit:4182
+#: ../dgit:4225

 msgid "current archive contents"
 msgstr ""
 
 msgid "current archive contents"
 msgstr ""
 

-#: ../dgit:4195
+#: ../dgit:4238

 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 
 msgid ""
 "| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).\n"
 msgstr ""
 

-#: ../dgit:4205
+#: ../dgit:4248

 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Declare fast forward from %s\n"
 msgstr ""
 

-#: ../dgit:4206
+#: ../dgit:4249

 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Make fast forward from %s\n"
 msgstr ""
 

-#: ../dgit:4210
+#: ../dgit:4253

 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 
 #, perl-format
 msgid "Made pseudo-merge of %s into dgit view."
 msgstr ""
 

-#: ../dgit:4223
+#: ../dgit:4266

 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 
 #, perl-format
 msgid "Declare fast forward from %s"
 msgstr ""
 

-#: ../dgit:4231
+#: ../dgit:4274

 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 
 #, perl-format
 msgid "Make pseudo-merge of %s into your HEAD."
 msgstr ""
 

-#: ../dgit:4243
+#: ../dgit:4286

 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 
 #, perl-format
 msgid "-p specified %s but changelog specified %s"
 msgstr ""
 

-#: ../dgit:4265
+#: ../dgit:4308

 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 
 #, perl-format
 msgid "%s is for %s %s but debian/changelog is for %s %s"
 msgstr ""
 

-#: ../dgit:4326
+#: ../dgit:4362

 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 
 #, perl-format
 msgid "changes field %s `%s' does not match changelog `%s'"
 msgstr ""
 

-#: ../dgit:4354
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4367
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4419
-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:4428
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4433
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4456
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4473
-#, 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:4497
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4528
-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:4538
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4572 ../dgit:4584
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4578
-#, 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:4588
-#, 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:4599
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4621
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4625
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4629
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4636
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4680
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4693
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4710
-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:4727
-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:4758
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4770
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4781
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4787 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4801
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4843
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4860
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4869
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4931
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4934
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4936
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4941
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4956
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4967
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5005
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5085
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5122
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5125
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5134
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5142
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5148
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5167
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5212
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5215
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5256
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5331
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5337
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5338
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5375
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5404
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5411
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5417
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5424
-#, 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:5431
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5440
-#, 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:5449
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5454
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5459
-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:5481
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5495
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5496
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5561
+#: ../dgit:5607

 msgid "maximum search space exceeded"
 msgstr ""
 
 msgid "maximum search space exceeded"
 msgstr ""
 

-#: ../dgit:5579
+#: ../dgit:5625

 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 
 #, perl-format
 msgid "has %s not %s"
 msgstr ""
 

-#: ../dgit:5588
+#: ../dgit:5634

 msgid "root commit"
 msgstr ""
 
 msgid "root commit"
 msgstr ""
 

-#: ../dgit:5594
+#: ../dgit:5640

 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 
 #, perl-format
 msgid "merge (%s nontrivial parents)"
 msgstr ""
 

-#: ../dgit:5606
+#: ../dgit:5652

 #, perl-format
 msgid "changed %s"
 msgstr ""
 
 #, perl-format
 msgid "changed %s"
 msgstr ""
 

-#: ../dgit:5625
+#: ../dgit:5671

 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "\n"
 "%s: error: quilt fixup cannot be linear.  Stopped at:\n"
 msgstr ""
 

-#: ../dgit:5632
+#: ../dgit:5678

 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s:  %s: %s\n"
 msgstr ""
 

-#: ../dgit:5644
+#: ../dgit:5690

 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 
 msgid "quilt history linearisation failed.  Search `quilt fixup' in dgit(7).\n"
 msgstr ""
 

-#: ../dgit:5647
+#: ../dgit:5693

 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 
 msgid "quilt fixup cannot be linear, smashing..."
 msgstr ""
 

-#: ../dgit:5659
+#: ../dgit:5705

 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"
 #, perl-format
 msgid ""
 "Automatically generated patch (%s)\n"


@@ -1463,68 +1084,84 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:5666
+#: ../dgit:5712

 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 
 msgid "quiltify linearisation planning successful, executing..."
 msgstr ""
 

-#: ../dgit:5700
+#: ../dgit:5746

 msgid "contains unexpected slashes\n"
 msgstr ""
 
 msgid "contains unexpected slashes\n"
 msgstr ""
 

-#: ../dgit:5701
+#: ../dgit:5747

 msgid "contains leading punctuation\n"
 msgstr ""
 
 msgid "contains leading punctuation\n"
 msgstr ""
 

-#: ../dgit:5702
+#: ../dgit:5748

 msgid "contains bad character(s)\n"
 msgstr ""
 
 msgid "contains bad character(s)\n"
 msgstr ""
 

-#: ../dgit:5703
+#: ../dgit:5749

 msgid "is series file\n"
 msgstr ""
 
 msgid "is series file\n"
 msgstr ""
 

-#: ../dgit:5704
+#: ../dgit:5750

 msgid "too long\n"
 msgstr ""
 
 msgid "too long\n"
 msgstr ""
 

-#: ../dgit:5708
+#: ../dgit:5754

 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
 msgstr ""
 

-#: ../dgit:5737
+#: ../dgit:5783

 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 
 #, perl-format
 msgid "dgit: patch title transliteration error: %s"
 msgstr ""
 

-#: ../dgit:5880
+#: ../dgit:5866
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5884
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5885
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5939

 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 
 msgid "Commit removal of .pc (quilt series tracking data)\n"
 msgstr ""
 

-#: ../dgit:5890
+#: ../dgit:5949

 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 
 msgid "starting quiltify (single-debian-patch)"
 msgstr ""
 

-#: ../dgit:5992
+#: ../dgit:6059

 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 
 #, perl-format
 msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
 msgstr ""
 

-#: ../dgit:6023
+#: ../dgit:6091

 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 
 #, perl-format
 msgid "dgit view: found cached (%s)"
 msgstr ""
 

-#: ../dgit:6028
+#: ../dgit:6096

 msgid "dgit view: found cached, no changes required"
 msgstr ""
 
 msgid "dgit view: found cached, no changes required"
 msgstr ""
 

-#: ../dgit:6039
+#: ../dgit:6131

 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 
 #, perl-format
 msgid "examining quilt state (multiple patches, %s mode)"
 msgstr ""
 

-#: ../dgit:6130
+#: ../dgit:6245

 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"
 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 +1169,84 @@ msgid ""
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 
 " anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).\n"
 msgstr ""
 

-#: ../dgit:6144
+#: ../dgit:6259

 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 
 msgid "Tree already contains .pc - will use it then delete it."
 msgstr ""
 

-#: ../dgit:6181
+#: ../dgit:6293
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6306
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6324
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6340
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6354
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6378

 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 
 #, perl-format
 msgid "%s: base trees orig=%.20s o+d/p=%.20s"
 msgstr ""
 

-#: ../dgit:6184
+#: ../dgit:6388

 #, perl-format
 msgid ""
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n"
 #, 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 ""
 
 msgstr ""
 

-#: ../dgit:6190
+#: ../dgit:6397

 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "dgit:  cannot represent change: %s: %s\n"
 msgstr ""
 

-#: ../dgit:6194
+#: ../dgit:6401

 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 
 msgid ""
 "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
 msgstr ""
 

-#: ../dgit:6201
+#: ../dgit:6408
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6412

 msgid "This might be a patches-unapplied branch."
 msgstr ""
 
 msgid "This might be a patches-unapplied branch."
 msgstr ""
 

-#: ../dgit:6204
+#: ../dgit:6415

 msgid "This might be a patches-applied branch."
 msgstr ""
 
 msgid "This might be a patches-applied branch."
 msgstr ""
 

-#: ../dgit:6207
+#: ../dgit:6418

 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 
 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
 msgstr ""
 

-#: ../dgit:6210
+#: ../dgit:6421

 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 
 msgid "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)."
 msgstr ""
 

-#: ../dgit:6214
+#: ../dgit:6425

 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 
 msgid "Maybe orig tarball(s) are not identical to git representation?"
 msgstr ""
 

-#: ../dgit:6223
+#: ../dgit:6436

 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 
 #, perl-format
 msgid "starting quiltify (multiple patches, %s mode)"
 msgstr ""
 

-#: ../dgit:6261
+#: ../dgit:6475

 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
 msgid ""
 "\n"
 "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"


@@ -1592,102 +1255,124 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: ../dgit:6273
+#: ../dgit:6487

 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 
 msgid "dgit: Unapplying patches again to tidy up the tree."
 msgstr ""
 

-#: ../dgit:6302
+#: ../dgit:6516

 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 ""
 
 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:6314
+#: ../dgit:6528

 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 
 msgid "tree contains uncommitted files and --clean=check specified"
 msgstr ""
 

-#: ../dgit:6317
+#: ../dgit:6531

 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
 msgstr ""
 
 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
 msgstr ""
 

-#: ../dgit:6320
+#: ../dgit:6534

 msgid ""
 "tree contains uncommited, untracked, unignored files\n"
 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
 msgstr ""
 
 msgid ""
 "tree contains uncommited, untracked, unignored files\n"
 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
 msgstr ""
 

-#: ../dgit:6338
+#: ../dgit:6547
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6564

 msgid "tree contains uncommitted files (after running rules clean)"
 msgstr ""
 
 msgid "tree contains uncommitted files (after running rules clean)"
 msgstr ""
 

-#: ../dgit:6352
+#: ../dgit:6578

 msgid "clean takes no additional arguments"
 msgstr ""
 
 msgid "clean takes no additional arguments"
 msgstr ""
 

-#: ../dgit:6365
+#: ../dgit:6597

 #, perl-format
 #, perl-format

-msgid "-p is not allowed with dgit %s"
+msgid "-p specified package %s, but changelog says %s"

 msgstr ""
 
 msgstr ""
 

-#: ../dgit:6404
+#: ../dgit:6607
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6616
+#, perl-format
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6620
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6655

 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "remove old changes file %s: %s"
 msgstr ""
 

-#: ../dgit:6406
+#: ../dgit:6657

 #, perl-format
 msgid "would remove %s"
 msgstr ""
 
 #, perl-format
 msgid "would remove %s"
 msgstr ""
 

-#: ../dgit:6432
+#: ../dgit:6683

 msgid "archive query failed (queried because --since-version not specified)"
 msgstr ""
 
 msgid "archive query failed (queried because --since-version not specified)"
 msgstr ""
 

-#: ../dgit:6438
+#: ../dgit:6689

 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 
 #, perl-format
 msgid "changelog will contain changes since %s"
 msgstr ""
 

-#: ../dgit:6441
+#: ../dgit:6692

 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 
 msgid "package seems new, not specifying -v<version>"
 msgstr ""
 

-#: ../dgit:6484
+#: ../dgit:6735

 msgid "Wanted to build nothing!"
 msgstr ""
 
 msgid "Wanted to build nothing!"
 msgstr ""
 

-#: ../dgit:6522
+#: ../dgit:6773

 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 
 #, perl-format
 msgid "only one changes file from build (%s)\n"
 msgstr ""
 

-#: ../dgit:6529
+#: ../dgit:6780

 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 
 #, perl-format
 msgid "%s found in binaries changes file %s"
 msgstr ""
 

-#: ../dgit:6536
+#: ../dgit:6787

 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 
 #, perl-format
 msgid "%s unexpectedly not created by build"
 msgstr ""
 

-#: ../dgit:6540
+#: ../dgit:6791

 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 
 #, perl-format
 msgid "install new changes %s{,.inmulti}: %s"
 msgstr ""
 

-#: ../dgit:6545
+#: ../dgit:6796

 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 
 #, perl-format
 msgid "wrong number of different changes files (%s)"
 msgstr ""
 

-#: ../dgit:6548
+#: ../dgit:6799

 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 
 #, perl-format
 msgid "build successful, results in %s\n"
 msgstr ""
 

-#: ../dgit:6561
+#: ../dgit:6812

 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "
 #, perl-format
 msgid ""
 "changes files other than source matching %s already present; building would "


@@ -1695,136 +1380,136 @@ msgid ""
 "Suggest you delete %s.\n"
 msgstr ""
 
 "Suggest you delete %s.\n"
 msgstr ""
 

-#: ../dgit:6579
+#: ../dgit:6830

 msgid "build successful\n"
 msgstr ""
 
 msgid "build successful\n"
 msgstr ""
 

-#: ../dgit:6586
+#: ../dgit:6837

 #, 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 ""
 
 #, 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:6696
+#: ../dgit:6947

 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "remove %s: %s"
 msgstr ""
 

-#: ../dgit:6731
+#: ../dgit:6984

 msgid "--include-dirty not supported with --build-products-dir, sorry"
 msgstr ""
 
 msgid "--include-dirty not supported with --build-products-dir, sorry"
 msgstr ""
 

-#: ../dgit:6751
+#: ../dgit:7004

 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 
 #, perl-format
 msgid "put in place new built file (%s): %s"
 msgstr ""
 

-#: ../dgit:6764
+#: ../dgit:7017

 msgid "build-source takes no additional arguments"
 msgstr ""
 
 msgid "build-source takes no additional arguments"
 msgstr ""
 

-#: ../dgit:6768
+#: ../dgit:7021

 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 
 #, perl-format
 msgid "source built, results in %s and %s"
 msgstr ""
 

-#: ../dgit:6775
+#: ../dgit:7028

 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 
 msgid ""
 "dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
 "push-source!"
 msgstr ""
 

-#: ../dgit:6781
+#: ../dgit:7034

 msgid "source changes file"
 msgstr ""
 
 msgid "source changes file"
 msgstr ""
 

-#: ../dgit:6783
+#: ../dgit:7036

 msgid "user-specified changes file is not source-only"
 msgstr ""
 
 msgid "user-specified changes file is not source-only"
 msgstr ""
 

-#: ../dgit:6803 ../dgit:6805
+#: ../dgit:7056 ../dgit:7058

 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 
 #, perl-format
 msgid "%s (in build products dir): %s"
 msgstr ""
 

-#: ../dgit:6818
+#: ../dgit:7071

 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 ""
 
 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:6830
+#: ../dgit:7083

 msgid ""
 "you asked for a builder but your debbuildopts didn't ask for any binaries -- "
 "is this really what you meant?"
 msgstr ""
 
 msgid ""
 "you asked for a builder but your debbuildopts didn't ask for any binaries -- "
 "is this really what you meant?"
 msgstr ""
 

-#: ../dgit:6834
+#: ../dgit:7087

 msgid ""
 "we must build a .dsc to pass to the builder but your debbuiltopts forbids "
 "the building of a source package; cannot continue"
 msgstr ""
 
 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:6864
+#: ../dgit:7117

 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 
 msgid "incorrect arguments to dgit print-unapplied-treeish"
 msgstr ""
 

-#: ../dgit:6886
+#: ../dgit:7138

 msgid "source tree"
 msgstr ""
 
 msgid "source tree"
 msgstr ""
 

-#: ../dgit:6888
+#: ../dgit:7140

 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 
 #, perl-format
 msgid "dgit: import-dsc: %s"
 msgstr ""
 

-#: ../dgit:6901
+#: ../dgit:7153

 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown dgit import-dsc sub-option `%s'"
 msgstr ""
 

-#: ../dgit:6905
+#: ../dgit:7157

 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 
 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
 msgstr ""
 

-#: ../dgit:6909
+#: ../dgit:7161

 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 
 msgid "dry run makes no sense with import-dsc"
 msgstr ""
 

-#: ../dgit:6926
+#: ../dgit:7178

 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 
 #, perl-format
 msgid "%s is checked out - will not update it"
 msgstr ""
 

-#: ../dgit:6931
+#: ../dgit:7183

 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 
 #, perl-format
 msgid "open import .dsc (%s): %s"
 msgstr ""
 

-#: ../dgit:6933
+#: ../dgit:7185

 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "read %s: %s"
 msgstr ""
 

-#: ../dgit:6944
+#: ../dgit:7196

 msgid "import-dsc signature check failed"
 msgstr ""
 
 msgid "import-dsc signature check failed"
 msgstr ""
 

-#: ../dgit:6947
+#: ../dgit:7199

 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: warning: importing unsigned .dsc\n"
 msgstr ""
 

-#: ../dgit:6958
+#: ../dgit:7210

 msgid "Dgit metadata in .dsc"
 msgstr ""
 
 msgid "Dgit metadata in .dsc"
 msgstr ""
 

-#: ../dgit:6969
+#: ../dgit:7221

 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 
 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
 msgstr ""
 

-#: ../dgit:6978
+#: ../dgit:7230

 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"
 #, perl-format
 msgid ""
 ".dsc contains Dgit field referring to object %s\n"


@@ -1832,21 +1517,21 @@ msgid ""
 "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 
 "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
 msgstr ""
 

-#: ../dgit:6985
+#: ../dgit:7237

 msgid "Not fast forward, forced update."
 msgstr ""
 
 msgid "Not fast forward, forced update."
 msgstr ""
 

-#: ../dgit:6987
+#: ../dgit:7239

 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 
 #, perl-format
 msgid "Not fast forward to %s"
 msgstr ""
 

-#: ../dgit:6992
+#: ../dgit:7244

 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 
 #, perl-format
 msgid "updated git ref %s"
 msgstr ""
 

-#: ../dgit:6997
+#: ../dgit:7249

 #, perl-format
 msgid ""
 "Branch %s already exists\n"
 #, perl-format
 msgid ""
 "Branch %s already exists\n"


@@ -1854,139 +1539,134 @@ msgid ""
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 
 "Specify  +%s to overwrite, discarding existing history\n"
 msgstr ""
 

-#: ../dgit:7009
+#: ../dgit:7269

 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 
 #, perl-format
 msgid "lstat %s works but stat gives %s !"
 msgstr ""
 

-#: ../dgit:7011
+#: ../dgit:7271

 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "stat %s: %s"
 msgstr ""
 

-#: ../dgit:7019
+#: ../dgit:7279

 #, perl-format
 #, perl-format

-msgid "cannot import %s which seems to be inside working tree!"
-msgstr ""
-
-#: ../dgit:7023
-#, perl-format
-msgid "import %s requires .../%s, but it does not exist"
+msgid "import %s requires %s, but: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../dgit:7028
+#: ../dgit:7298

 #, perl-format
 #, perl-format

-msgid "import %s requires %s, but: %s"
+msgid "cannot import %s which seems to be inside working tree!"

 msgstr ""
 
 msgstr ""
 

-#: ../dgit:7030
+#: ../dgit:7302

 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "symlink %s to %s: %s"
 msgstr ""
 

-#: ../dgit:7031
+#: ../dgit:7303

 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 
 #, perl-format
 msgid "made symlink %s -> %s"
 msgstr ""
 

-#: ../dgit:7042
+#: ../dgit:7314

 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 
 msgid "Import, forced update - synthetic orphan git history."
 msgstr ""
 

-#: ../dgit:7044
+#: ../dgit:7316

 msgid "Import, merging."
 msgstr ""
 
 msgid "Import, merging."
 msgstr ""
 

-#: ../dgit:7058
+#: ../dgit:7330

 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Merge %s (%s) import into %s\n"
 msgstr ""
 

-#: ../dgit:7067
+#: ../dgit:7339

 #, perl-format
 msgid "results are in git ref %s"
 msgstr ""
 
 #, perl-format
 msgid "results are in git ref %s"
 msgstr ""
 

-#: ../dgit:7074
+#: ../dgit:7346

 msgid "need only 1 subpath argument"
 msgstr ""
 
 msgid "need only 1 subpath argument"
 msgstr ""
 

-#: ../dgit:7080
+#: ../dgit:7352

 #, perl-format
 msgid "exec curl: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "exec curl: %s\n"
 msgstr ""
 

-#: ../dgit:7094
+#: ../dgit:7366

 msgid "need destination argument"
 msgstr ""
 
 msgid "need destination argument"
 msgstr ""
 

-#: ../dgit:7099
+#: ../dgit:7371

 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "exec git clone: %s\n"
 msgstr ""
 

-#: ../dgit:7107
+#: ../dgit:7379

 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 
 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
 msgstr ""
 

-#: ../dgit:7118
+#: ../dgit:7390

 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 
 msgid "no arguments allowed to dgit print-dpkg-source-ignores"
 msgstr ""
 

-#: ../dgit:7124
+#: ../dgit:7396

 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 
 msgid "no arguments allowed to dgit setup-mergechangelogs"
 msgstr ""
 

-#: ../dgit:7131 ../dgit:7137
+#: ../dgit:7403 ../dgit:7409

 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 
 msgid "no arguments allowed to dgit setup-useremail"
 msgstr ""
 

-#: ../dgit:7143
+#: ../dgit:7415

 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 
 msgid "no arguments allowed to dgit setup-tree"
 msgstr ""
 

-#: ../dgit:7190
+#: ../dgit:7462

 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 
 msgid ""
 "--initiator-tempdir must be used specify an absolute, not relative, "
 "directory."
 msgstr ""
 

-#: ../dgit:7229
+#: ../dgit:7501

 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 
 #, perl-format
 msgid "%s needs a value"
 msgstr ""
 

-#: ../dgit:7233
+#: ../dgit:7505

 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 
 #, perl-format
 msgid "bad value `%s' for %s"
 msgstr ""
 

-#: ../dgit:7324
+#: ../dgit:7605

 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: warning: ignoring unknown force option %s\n"
 msgstr ""
 

-#: ../dgit:7344
+#: ../dgit:7620

 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown long option `%s'"
 msgstr ""
 

-#: ../dgit:7399
+#: ../dgit:7675

 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown short option `%s'"
 msgstr ""
 

-#: ../dgit:7414
+#: ../dgit:7690

 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 
 #, perl-format
 msgid "%s is set to something other than SIG_DFL\n"
 msgstr ""
 

-#: ../dgit:7418
+#: ../dgit:7694

 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 
 #, perl-format
 msgid "%s is blocked\n"
 msgstr ""
 

-#: ../dgit:7424
+#: ../dgit:7700

 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"
 #, perl-format
 msgid ""
 "On entry to dgit, %s\n"


@@ -1994,49 +1674,40 @@ msgid ""
 "Giving up.\n"
 msgstr ""
 
 "Giving up.\n"
 msgstr ""
 

-#: ../dgit:7441
+#: ../dgit:7717

 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 
 #, perl-format
 msgid "cannot set command for %s"
 msgstr ""
 

-#: ../dgit:7454
+#: ../dgit:7730

 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 
 #, perl-format
 msgid "cannot configure options for %s"
 msgstr ""
 

-#: ../dgit:7474
+#: ../dgit:7750

 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown quilt-mode `%s'"
 msgstr ""
 

-#: ../dgit:7484
+#: ../dgit:7761

 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 
 #, perl-format
 msgid "unknown %s setting `%s'"
 msgstr ""
 

-#: ../dgit:7489
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7500
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7521
+#: ../dgit:7789

 msgid "DRY RUN ONLY\n"
 msgstr ""
 
 msgid "DRY RUN ONLY\n"
 msgstr ""
 

-#: ../dgit:7522
+#: ../dgit:7790

 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 
 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
 msgstr ""
 

-#: ../dgit:7541
+#: ../dgit:7809

 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown operation %s"
 msgstr ""
 

-#: ../git-debrebase:44
+#: ../git-debrebase:45

 msgid ""
 "usages:\n"
 "  git-debrebase [<options>] [--|-i <git rebase options...>]\n"
 msgid ""
 "usages:\n"
 "  git-debrebase [<options>] [--|-i <git rebase options...>]\n"


@@ -2049,60 +1720,60 @@ msgid ""
 "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
 msgstr ""
 
 "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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, perl-format
 msgid "missing required git config %s"
 msgstr ""
 

-#: ../git-debrebase:401
+#: ../git-debrebase:364

 #, perl-format
 msgid "%s: snag ignored (-f%s): %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: snag ignored (-f%s): %s\n"
 msgstr ""
 

-#: ../git-debrebase:404
+#: ../git-debrebase:367

 #, perl-format
 msgid "%s: snag detected (-f%s): %s\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: snag detected (-f%s): %s\n"
 msgstr ""
 

-#: ../git-debrebase:417
+#: ../git-debrebase:380

 #, perl-format
 msgid "%s: snags: %d overriden by individual -f options\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: snags: %d overriden by individual -f options\n"
 msgstr ""
 

-#: ../git-debrebase:423
+#: ../git-debrebase:386

 #, perl-format
 msgid "%s: snags: %d overriden by global --force\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: snags: %d overriden by global --force\n"
 msgstr ""
 

-#: ../git-debrebase:427
+#: ../git-debrebase:390

 #, perl-format
 msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
 msgstr ""
 
 #, perl-format
 msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
 msgstr ""
 

-#: ../git-debrebase:459
+#: ../git-debrebase:422

 msgid ""
 "Branch/history seems mangled - no longer in gdr format.\n"
 "See ILLEGAL OPERATIONS in git-debrebase(5).\n"
 msgstr ""
 
 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:429

 #, perl-format
 msgid ""
 "%s\n"
 "Is this meant to be a gdr branch?  %s\n"
 msgstr ""
 
 #, perl-format
 msgid ""
 "%s\n"
 "Is this meant to be a gdr branch?  %s\n"
 msgstr ""
 

-#: ../git-debrebase:471
+#: ../git-debrebase:434

 #, perl-format
 msgid ""
 "%s\n"
 #, perl-format
 msgid ""
 "%s\n"


@@ -2110,7 +1781,7 @@ msgid ""
 "Consider git-debrebase scrap, to throw away your recent work.\n"
 msgstr ""
 
 "Consider git-debrebase scrap, to throw away your recent work.\n"
 msgstr ""
 

-#: ../git-debrebase:477
+#: ../git-debrebase:440

 #, perl-format
 msgid ""
 "%s\n"
 #, perl-format
 msgid ""
 "%s\n"


@@ -2118,7 +1789,7 @@ msgid ""
 "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
 msgstr ""
 
 "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
 msgstr ""
 

-#: ../git-debrebase:488
+#: ../git-debrebase:451

 #, perl-format
 msgid ""
 "%s\n"
 #, perl-format
 msgid ""
 "%s\n"


@@ -2126,418 +1797,415 @@ msgid ""
 "Maybe you reset to, or rebased from, somewhere inappropriate.\n"
 msgstr ""
 
 "Maybe you reset to, or rebased from, somewhere inappropriate.\n"
 msgstr ""
 

-#: ../git-debrebase:935
+#: ../git-debrebase:898

 #, perl-format
 msgid "git-debrebase `anchor' but %s"
 msgstr ""
 
 #, perl-format
 msgid "git-debrebase `anchor' but %s"
 msgstr ""
 

-#: ../git-debrebase:937
+#: ../git-debrebase:900

 msgid "has other than two parents"
 msgstr ""
 
 msgid "has other than two parents"
 msgstr ""
 

-#: ../git-debrebase:938
+#: ../git-debrebase:901

 msgid "contains debian/patches"
 msgstr ""
 
 msgid "contains debian/patches"
 msgstr ""
 

-#: ../git-debrebase:964
+#: ../git-debrebase:927

 msgid "is an origin commit"
 msgstr ""
 
 msgid "is an origin commit"
 msgstr ""
 

-#: ../git-debrebase:966
+#: ../git-debrebase:929

 msgid "upstream files differ from left parent"
 msgstr ""
 
 msgid "upstream files differ from left parent"
 msgstr ""
 

-#: ../git-debrebase:968
+#: ../git-debrebase:931

 msgid "debian/ differs from right parent"
 msgstr ""
 
 msgid "debian/ differs from right parent"
 msgstr ""
 

-#: ../git-debrebase:979
+#: ../git-debrebase:942

 msgid "edits debian/patches"
 msgstr ""
 
 msgid "edits debian/patches"
 msgstr ""
 

-#: ../git-debrebase:991
+#: ../git-debrebase:954

 msgid "parent's debian is not a directory"
 msgstr ""
 
 msgid "parent's debian is not a directory"
 msgstr ""
 

-#: ../git-debrebase:998
+#: ../git-debrebase:961

 msgid "no changes"
 msgstr ""
 
 msgid "no changes"
 msgstr ""
 

-#: ../git-debrebase:1004
+#: ../git-debrebase:967

 msgid "origin commit"
 msgstr ""
 
 msgid "origin commit"
 msgstr ""
 

-#: ../git-debrebase:1055
+#: ../git-debrebase:1018

 #, perl-format
 msgid "unknown kind of merge from %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown kind of merge from %s"
 msgstr ""
 

-#: ../git-debrebase:1058
+#: ../git-debrebase:1021

 msgid "octopus merge"
 msgstr ""
 
 msgid "octopus merge"
 msgstr ""
 

-#: ../git-debrebase:1062
+#: ../git-debrebase:1025

 msgid "general two-parent merge"
 msgstr ""
 
 msgid "general two-parent merge"
 msgstr ""
 

-#: ../git-debrebase:1079
+#: ../git-debrebase:1042

 #, perl-format
 msgid "inconsistent anchors in merged-breakwaters %s"
 msgstr ""
 
 #, perl-format
 msgid "inconsistent anchors in merged-breakwaters %s"
 msgstr ""
 

-#: ../git-debrebase:1119
+#: ../git-debrebase:1082

 #, perl-format
 msgid "branch needs laundering (run git-debrebase): %s"
 msgstr ""
 
 #, perl-format
 msgid "branch needs laundering (run git-debrebase): %s"
 msgstr ""
 

-#: ../git-debrebase:1147
+#: ../git-debrebase:1110

 #, perl-format
 msgid "packaging change (%s) follows upstream change"
 msgstr ""
 
 #, perl-format
 msgid "packaging change (%s) follows upstream change"
 msgstr ""
 

-#: ../git-debrebase:1148
+#: ../git-debrebase:1111

 #, perl-format
 msgid " (eg %s)"
 msgstr ""
 
 #, perl-format
 msgid " (eg %s)"
 msgstr ""
 

-#: ../git-debrebase:1154
+#: ../git-debrebase:1117

 msgid "found mixed upstream/packaging commit"
 msgstr ""
 
 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:1118 ../git-debrebase:1126 ../git-debrebase:1131
+#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150

 #, perl-format
 msgid " (%s)"
 msgstr ""
 
 #, perl-format
 msgid " (%s)"
 msgstr ""
 

-#: ../git-debrebase:1162
+#: ../git-debrebase:1125

 #, perl-format
 msgid "found interchange bureaucracy commit (%s)"
 msgstr ""
 
 #, perl-format
 msgid "found interchange bureaucracy commit (%s)"
 msgstr ""
 

-#: ../git-debrebase:1167
+#: ../git-debrebase:1130

 msgid "found dgit dsc import"
 msgstr ""
 
 msgid "found dgit dsc import"
 msgstr ""
 

-#: ../git-debrebase:1172
+#: ../git-debrebase:1135

 msgid "found bare dgit dsc import with no prior history"
 msgstr ""
 
 msgid "found bare dgit dsc import with no prior history"
 msgstr ""
 

-#: ../git-debrebase:1178
+#: ../git-debrebase:1141

 msgid "found vanilla merge"
 msgstr ""
 
 msgid "found vanilla merge"
 msgstr ""
 

-#: ../git-debrebase:1185
+#: ../git-debrebase:1148

 #, perl-format
 msgid "found unprocessable commit, cannot cope: %s"
 msgstr ""
 
 #, perl-format
 msgid "found unprocessable commit, cannot cope: %s"
 msgstr ""
 

-#: ../git-debrebase:1253
+#: ../git-debrebase:1216

 #, perl-format
 msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
 msgstr ""
 
 #, perl-format
 msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
 msgstr ""
 

-#: ../git-debrebase:1254
+#: ../git-debrebase:1217

 #, perl-format
 msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
 msgstr ""
 
 #, perl-format
 msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
 msgstr ""
 

-#: ../git-debrebase:1375
+#: ../git-debrebase:1338

 msgid "bare dgit dsc import"
 msgstr ""
 
 msgid "bare dgit dsc import"
 msgstr ""
 

-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1678 ../git-debrebase:1681

 #, perl-format
 msgid "mismatch %s ?"
 msgstr ""
 
 #, perl-format
 msgid "mismatch %s ?"
 msgstr ""
 

-#: ../git-debrebase:1721
+#: ../git-debrebase:1684

 #, perl-format
 msgid "mismatch %s != %s ?"
 msgstr ""
 
 #, perl-format
 msgid "mismatch %s != %s ?"
 msgstr ""
 

-#: ../git-debrebase:1731
+#: ../git-debrebase:1694

 #, perl-format
 msgid "internal error %#x %s %s"
 msgstr ""
 
 #, perl-format
 msgid "internal error %#x %s %s"
 msgstr ""
 

-#: ../git-debrebase:1759
+#: ../git-debrebase:1722

 #, perl-format
 msgid "%s: laundered (head was %s)\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: laundered (head was %s)\n"
 msgstr ""
 

-#: ../git-debrebase:1773
+#: ../git-debrebase:1736

 msgid "you are in the middle of a git-rebase already"
 msgstr ""
 
 msgid "you are in the middle of a git-rebase already"
 msgstr ""
 

-#: ../git-debrebase:1799
+#: ../git-debrebase:1762

 msgid "launder for rebase"
 msgstr ""
 
 msgid "launder for rebase"
 msgstr ""
 

-#: ../git-debrebase:1804
+#: ../git-debrebase:1767

 msgid "analyse does not support any options"
 msgstr ""
 
 msgid "analyse does not support any options"
 msgstr ""
 

-#: ../git-debrebase:1806
+#: ../git-debrebase:1769

 msgid "too many arguments to analyse"
 msgstr ""
 
 msgid "too many arguments to analyse"
 msgstr ""
 

-#: ../git-debrebase:1841
+#: ../git-debrebase:1802
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1804

 msgid "HEAD symref is not to refs/heads/"
 msgstr ""
 
 msgid "HEAD symref is not to refs/heads/"
 msgstr ""
 

-#: ../git-debrebase:1864
+#: ../git-debrebase:1827

 #, perl-format
 msgid "OK, you are ahead of %s\n"
 msgstr ""
 
 #, perl-format
 msgid "OK, you are ahead of %s\n"
 msgstr ""
 

-#: ../git-debrebase:1868
+#: ../git-debrebase:1831

 #, perl-format
 msgid "you are behind %s, divergence risk"
 msgstr ""
 
 #, perl-format
 msgid "you are behind %s, divergence risk"
 msgstr ""
 

-#: ../git-debrebase:1872
+#: ../git-debrebase:1835

 #, perl-format
 msgid "you have diverged from %s"
 msgstr ""
 
 #, perl-format
 msgid "you have diverged from %s"
 msgstr ""
 

-#: ../git-debrebase:1894
+#: ../git-debrebase:1857

 msgid "remote dgit branch"
 msgstr ""
 
 msgid "remote dgit branch"
 msgstr ""
 

-#: ../git-debrebase:1897
+#: ../git-debrebase:1860

 msgid "remote dgit branch for sid"
 msgstr ""
 
 msgid "remote dgit branch for sid"
 msgstr ""
 

-#: ../git-debrebase:1925
+#: ../git-debrebase:1888

 msgid "Recorded previous head for preservation"
 msgstr ""
 
 msgid "Recorded previous head for preservation"
 msgstr ""
 

-#: ../git-debrebase:1933
+#: ../git-debrebase:1896

 #, perl-format
 msgid "could not record ffq-prev: %s"
 msgstr ""
 
 #, perl-format
 msgid "could not record ffq-prev: %s"
 msgstr ""
 

-#: ../git-debrebase:1944
+#: ../git-debrebase:1907

 #, perl-format
 msgid "could not check ffq-prev: %s"
 msgstr ""
 
 #, perl-format
 msgid "could not check ffq-prev: %s"
 msgstr ""
 

-#: ../git-debrebase:1964
+#: ../git-debrebase:1927

 msgid "fast forward"
 msgstr ""
 
 msgid "fast forward"
 msgstr ""
 

-#: ../git-debrebase:1974
+#: ../git-debrebase:1937

 msgid "Declare fast forward / record previous work"
 msgstr ""
 
 msgid "Declare fast forward / record previous work"
 msgstr ""
 

-#: ../git-debrebase:1986
+#: ../git-debrebase:1949

 msgid "No ffq-prev to stitch."
 msgstr ""
 
 msgid "No ffq-prev to stitch."
 msgstr ""
 

-#: ../git-debrebase:2016
-#, 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:2033
+#: ../git-debrebase:1966

 msgid "need NEW-VERSION [UPS-COMMITTISH]"
 msgstr ""
 
 msgid "need NEW-VERSION [UPS-COMMITTISH]"
 msgstr ""
 

-#: ../git-debrebase:2038
+#: ../git-debrebase:1971

 #, perl-format
 msgid "bad version number `%s'"
 msgstr ""
 
 #, perl-format
 msgid "bad version number `%s'"
 msgstr ""
 

-#: ../git-debrebase:2055
+#: ../git-debrebase:1989

 #, perl-format
 msgid "upstream piece `%s'"
 msgstr ""
 
 #, perl-format
 msgid "upstream piece `%s'"
 msgstr ""
 

-#: ../git-debrebase:2056
+#: ../git-debrebase:1990

 msgid "upstream (main piece"
 msgstr ""
 
 msgid "upstream (main piece"
 msgstr ""
 

-#: ../git-debrebase:2076
+#: ../git-debrebase:2010

 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
 msgstr ""
 
 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
 msgstr ""
 

-#: ../git-debrebase:2094
+#: ../git-debrebase:2028

 msgid "old anchor is recognised due to --anchor, cannot check upstream"
 msgstr "old anchor is recognized due to --anchor, cannot check upstream"
 
 msgid "old anchor is recognised due to --anchor, cannot check upstream"
 msgstr "old anchor is recognized due to --anchor, cannot check upstream"
 

-#: ../git-debrebase:2110
+#: ../git-debrebase:2044

 #, 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 ""
 
 #, 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:2119
+#: ../git-debrebase:2053

 #, perl-format
 msgid "previous upstream combine %s first piece is not `.'"
 msgstr ""
 
 #, perl-format
 msgid "previous upstream combine %s first piece is not `.'"
 msgstr ""
 

-#: ../git-debrebase:2132
+#: ../git-debrebase:2066

 #, perl-format
 msgid ""
 "previous upstream %s is from git-debrebase but not an `upstream-combine' "
 "commit"
 msgstr ""
 
 #, perl-format
 msgid ""
 "previous upstream %s is from git-debrebase but not an `upstream-combine' "
 "commit"
 msgstr ""
 

-#: ../git-debrebase:2143
+#: ../git-debrebase:2077

 #, perl-format
 msgid "introducing upstream piece `%s'"
 msgstr ""
 
 #, perl-format
 msgid "introducing upstream piece `%s'"
 msgstr ""
 

-#: ../git-debrebase:2146
+#: ../git-debrebase:2080

 #, perl-format
 msgid "dropping upstream piece `%s'"
 msgstr ""
 
 #, perl-format
 msgid "dropping upstream piece `%s'"
 msgstr ""
 

-#: ../git-debrebase:2149
+#: ../git-debrebase:2083

 #, perl-format
 msgid "not fast forward: %s %s"
 msgstr ""
 
 #, perl-format
 msgid "not fast forward: %s %s"
 msgstr ""
 

-#: ../git-debrebase:2260
+#: ../git-debrebase:2194

 msgid "Previous head already recorded\n"
 msgstr ""
 
 msgid "Previous head already recorded\n"
 msgstr ""
 

-#: ../git-debrebase:2264
+#: ../git-debrebase:2198

 #, perl-format
 msgid "Could not preserve: %s"
 msgstr ""
 
 #, perl-format
 msgid "Could not preserve: %s"
 msgstr ""
 

-#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281
-#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404
-#: ../git-debrebase:2468
+#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215
+#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338
+#: ../git-debrebase:2402

 msgid "no arguments allowed"
 msgstr ""
 
 msgid "no arguments allowed"
 msgstr ""
 

-#: ../git-debrebase:2303
+#: ../git-debrebase:2237

 msgid "branch contains furniture (not laundered)"
 msgstr ""
 
 msgid "branch contains furniture (not laundered)"
 msgstr ""
 

-#: ../git-debrebase:2304
+#: ../git-debrebase:2238

 msgid "branch is unlaundered"
 msgstr ""
 
 msgid "branch is unlaundered"
 msgstr ""
 

-#: ../git-debrebase:2305
+#: ../git-debrebase:2239

 msgid "branch needs laundering"
 msgstr ""
 
 msgid "branch needs laundering"
 msgstr ""
 

-#: ../git-debrebase:2306
+#: ../git-debrebase:2240

 msgid "branch not in git-debrebase form"
 msgstr ""
 
 msgid "branch not in git-debrebase form"
 msgstr ""
 

-#: ../git-debrebase:2316
+#: ../git-debrebase:2250

 msgid "current branch contents, in git-debrebase terms:\n"
 msgstr ""
 
 msgid "current branch contents, in git-debrebase terms:\n"
 msgstr ""
 

-#: ../git-debrebase:2318
+#: ../git-debrebase:2252

 msgid "  branch is laundered\n"
 msgstr ""
 
 msgid "  branch is laundered\n"
 msgstr ""
 

-#: ../git-debrebase:2334
+#: ../git-debrebase:2268

 #, perl-format
 msgid "  %s is not well-defined\n"
 msgstr ""
 
 #, perl-format
 msgid "  %s is not well-defined\n"
 msgstr ""
 

-#: ../git-debrebase:2340
+#: ../git-debrebase:2274

 msgid "key git-debrebase commits:\n"
 msgstr ""
 
 msgid "key git-debrebase commits:\n"
 msgstr ""
 

-#: ../git-debrebase:2341
+#: ../git-debrebase:2275

 msgid "anchor"
 msgstr ""
 
 msgid "anchor"
 msgstr ""
 

-#: ../git-debrebase:2342
+#: ../git-debrebase:2276

 msgid "breakwater"
 msgstr ""
 
 msgid "breakwater"
 msgstr ""
 

-#: ../git-debrebase:2347
+#: ../git-debrebase:2281

 msgid "branch and ref status, in git-debrebase terms:\n"
 msgstr ""
 
 msgid "branch and ref status, in git-debrebase terms:\n"
 msgstr ""
 

-#: ../git-debrebase:2354
+#: ../git-debrebase:2288

 msgid "  unstitched; previous tip was:\n"
 msgstr ""
 
 msgid "  unstitched; previous tip was:\n"
 msgstr ""
 

-#: ../git-debrebase:2357
+#: ../git-debrebase:2291

 msgid "  stitched? (no record of git-debrebase work)\n"
 msgstr ""
 
 msgid "  stitched? (no record of git-debrebase work)\n"
 msgstr ""
 

-#: ../git-debrebase:2359
+#: ../git-debrebase:2293

 msgid "  stitched\n"
 msgstr ""
 
 msgid "  stitched\n"
 msgstr ""
 

-#: ../git-debrebase:2361
+#: ../git-debrebase:2295

 msgid "  not git-debrebase (diverged since last stitch)\n"
 msgstr ""
 
 msgid "  not git-debrebase (diverged since last stitch)\n"
 msgstr ""
 

-#: ../git-debrebase:2364
+#: ../git-debrebase:2298

 msgid "you are currently rebasing\n"
 msgstr ""
 
 msgid "you are currently rebasing\n"
 msgstr ""
 

-#: ../git-debrebase:2381 ../git-debrebase:2394
+#: ../git-debrebase:2315 ../git-debrebase:2328

 msgid "launder for git-debrebase quick"
 msgstr ""
 
 msgid "launder for git-debrebase quick"
 msgstr ""
 

-#: ../git-debrebase:2388 ../git-debrebase:2418
+#: ../git-debrebase:2322 ../git-debrebase:2352

 msgid "No ongoing git-debrebase session."
 msgstr ""
 
 msgid "No ongoing git-debrebase session."
 msgstr ""
 

-#: ../git-debrebase:2457
+#: ../git-debrebase:2391

 msgid "Commit patch queue (exported by git-debrebase)"
 msgstr ""
 
 msgid "Commit patch queue (exported by git-debrebase)"
 msgstr ""
 

-#: ../git-debrebase:2474
+#: ../git-debrebase:2408

 msgid "No (more) patches to export."
 msgstr ""
 
 msgid "No (more) patches to export."
 msgstr ""
 

-#: ../git-debrebase:2481
+#: ../git-debrebase:2415

 #, perl-format
 msgid ""
 "Patch export produced patch amendments (abandoned output commit %s).  Try "
 "laundering first."
 msgstr ""
 
 #, perl-format
 msgid ""
 "Patch export produced patch amendments (abandoned output commit %s).  Try "
 "laundering first."
 msgstr ""
 

-#: ../git-debrebase:2501
+#: ../git-debrebase:2435

 #, perl-format
 msgid "%s contains comments, which will be discarded"
 msgstr ""
 
 #, perl-format
 msgid "%s contains comments, which will be discarded"
 msgstr ""
 

-#: ../git-debrebase:2506
+#: ../git-debrebase:2440

 #, perl-format
 msgid "patch %s repeated in %s !"
 msgstr ""
 
 #, perl-format
 msgid "patch %s repeated in %s !"
 msgstr ""
 

-#: ../git-debrebase:2513
+#: ../git-debrebase:2447

 #, perl-format
 msgid "Unused patch file %s will be discarded"
 msgstr ""
 
 #, perl-format
 msgid "Unused patch file %s will be discarded"
 msgstr ""
 

-#: ../git-debrebase:2521
+#: ../git-debrebase:2455

 msgid "ffq-prev exists, this is already managed by git-debrebase!"
 msgstr ""
 
 msgid "ffq-prev exists, this is already managed by git-debrebase!"
 msgstr ""
 

-#: ../git-debrebase:2526
+#: ../git-debrebase:2460

 msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
 msgstr ""
 
 msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
 msgstr ""
 

-#: ../git-debrebase:2542
+#: ../git-debrebase:2476

 msgid "want only 1 optional argument, the upstream git commitish"
 msgstr ""
 
 msgid "want only 1 optional argument, the upstream git commitish"
 msgstr ""
 

-#: ../git-debrebase:2547
+#: ../git-debrebase:2481

 msgid "missing Version from changelog\n"
 msgstr ""
 
 msgid "missing Version from changelog\n"
 msgstr ""
 

-#: ../git-debrebase:2563
+#: ../git-debrebase:2497

 #, perl-format
 msgid ""
 "upstream (%s) and HEAD are not\n"
 #, perl-format
 msgid ""
 "upstream (%s) and HEAD are not\n"


@@ -2545,58 +2213,58 @@ msgid ""
 "  git diff %s HEAD -- :!/debian :/\n"
 msgstr ""
 
 "  git diff %s HEAD -- :!/debian :/\n"
 msgstr ""
 

-#: ../git-debrebase:2571
+#: ../git-debrebase:2505

 #, perl-format
 msgid "upstream (%s) is not an ancestor of HEAD"
 msgstr ""
 
 #, perl-format
 msgid "upstream (%s) is not an ancestor of HEAD"
 msgstr ""
 

-#: ../git-debrebase:2578
+#: ../git-debrebase:2512

 #, 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 ""
 
 #, 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:2580
+#: ../git-debrebase:2514

 #, perl-format
 msgid "list expected changes with:  %s\n"
 msgstr ""
 
 #, perl-format
 msgid "list expected changes with:  %s\n"
 msgstr ""
 

-#: ../git-debrebase:2587
+#: ../git-debrebase:2521

 #, perl-format
 msgid "upstream (%s) contains debian/ directory"
 msgstr ""
 
 #, perl-format
 msgid "upstream (%s) contains debian/ directory"
 msgstr ""
 

-#: ../git-debrebase:2605
+#: ../git-debrebase:2539

 msgid "neither of the first two changelog entries are released\n"
 msgstr ""
 
 msgid "neither of the first two changelog entries are released\n"
 msgstr ""
 

-#: ../git-debrebase:2611
+#: ../git-debrebase:2545

 #, perl-format
 msgid "could not find suitable maintainer view tag %s\n"
 msgstr ""
 
 #, perl-format
 msgid "could not find suitable maintainer view tag %s\n"
 msgstr ""
 

-#: ../git-debrebase:2614
+#: ../git-debrebase:2548

 #, perl-format
 msgid "HEAD is not FF from maintainer tag %s!"
 msgstr ""
 
 #, perl-format
 msgid "HEAD is not FF from maintainer tag %s!"
 msgstr ""
 

-#: ../git-debrebase:2617
+#: ../git-debrebase:2551

 #, perl-format
 msgid "dgit view tag %s not found\n"
 msgstr ""
 
 #, perl-format
 msgid "dgit view tag %s not found\n"
 msgstr ""
 

-#: ../git-debrebase:2619
+#: ../git-debrebase:2553

 #, perl-format
 msgid "dgit view tag %s is not FF from maintainer tag %s\n"
 msgstr ""
 
 #, perl-format
 msgid "dgit view tag %s is not FF from maintainer tag %s\n"
 msgstr ""
 

-#: ../git-debrebase:2621
+#: ../git-debrebase:2555

 #, perl-format
 msgid "will stitch in dgit view, %s\n"
 msgstr ""
 
 #, perl-format
 msgid "will stitch in dgit view, %s\n"
 msgstr ""
 

-#: ../git-debrebase:2628
+#: ../git-debrebase:2562

 #, perl-format
 msgid ""
 "Cannot confirm dgit view: %s\n"
 #, perl-format
 msgid ""
 "Cannot confirm dgit view: %s\n"


@@ -2604,12 +2272,12 @@ msgid ""
 "dgit --overwrite will be needed on the first dgit push after conversion.\n"
 msgstr ""
 
 "dgit --overwrite will be needed on the first dgit push after conversion.\n"
 msgstr ""
 

-#: ../git-debrebase:2674
+#: ../git-debrebase:2608

 #, perl-format
 msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
 msgstr ""
 
 #, perl-format
 msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
 msgstr ""
 

-#: ../git-debrebase:2703
+#: ../git-debrebase:2637

 #, perl-format
 msgid ""
 "%s: converted to git-buildpackage branch format\n"
 #, perl-format
 msgid ""
 "%s: converted to git-buildpackage branch format\n"


@@ -2617,16 +2285,16 @@ msgid ""
 "%s: WARNING: doing so would drop all upstream patches!\n"
 msgstr ""
 
 "%s: WARNING: doing so would drop all upstream patches!\n"
 msgstr ""
 

-#: ../git-debrebase:2724
+#: ../git-debrebase:2658

 msgid "takes 1 optional argument, the upstream commitish"
 msgstr ""
 
 msgid "takes 1 optional argument, the upstream commitish"
 msgstr ""
 

-#: ../git-debrebase:2732
+#: ../git-debrebase:2666

 #, perl-format
 msgid "%s, from command line"
 msgstr ""
 
 #, perl-format
 msgid "%s, from command line"
 msgstr ""
 

-#: ../git-debrebase:2746
+#: ../git-debrebase:2680

 #, perl-format
 msgid ""
 "%s: Branch already seems to be in git-debrebase format!\n"
 #, perl-format
 msgid ""
 "%s: Branch already seems to be in git-debrebase format!\n"


@@ -2634,225 +2302,242 @@ msgid ""
 "%s: but is probably a bad idea.  Probably, you wanted to do nothing.\n"
 msgstr ""
 
 "%s: but is probably a bad idea.  Probably, you wanted to do nothing.\n"
 msgstr ""
 

-#: ../git-debrebase:2750
+#: ../git-debrebase:2684

 msgid "Branch already in git-debrebase format."
 msgstr ""
 
 msgid "Branch already in git-debrebase format."
 msgstr ""
 

-#: ../git-debrebase:2762
+#: ../git-debrebase:2696

 msgid "Considering possible commits corresponding to upstream:\n"
 msgstr ""
 
 msgid "Considering possible commits corresponding to upstream:\n"
 msgstr ""
 

-#: ../git-debrebase:2769
+#: ../git-debrebase:2703

 #, perl-format
 msgid "git tag %s"
 msgstr ""
 
 #, perl-format
 msgid "git tag %s"
 msgstr ""
 

-#: ../git-debrebase:2775
+#: ../git-debrebase:2709

 #, perl-format
 msgid " git tag: no suitable tag found (tried %s)\n"
 msgstr ""
 
 #, perl-format
 msgid " git tag: no suitable tag found (tried %s)\n"
 msgstr ""
 

-#: ../git-debrebase:2784
+#: ../git-debrebase:2718

 #, perl-format
 msgid "opendir build-products-dir %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "opendir build-products-dir %s: %s"
 msgstr ""
 

-#: ../git-debrebase:2790
+#: ../git-debrebase:2724

 #, perl-format
 msgid " orig: found what looks like a .orig, %s\n"
 msgstr ""
 
 #, perl-format
 msgid " orig: found what looks like a .orig, %s\n"
 msgstr ""
 

-#: ../git-debrebase:2821
+#: ../git-debrebase:2755

 #, perl-format
 msgid " orig: no suitable origs found (looked for %s in %s)\n"
 msgstr ""
 
 #, perl-format
 msgid " orig: no suitable origs found (looked for %s in %s)\n"
 msgstr ""
 

-#: ../git-debrebase:2830
+#: ../git-debrebase:2764

 msgid "Evaluating possible commits corresponding to upstream:\n"
 msgstr ""
 
 msgid "Evaluating possible commits corresponding to upstream:\n"
 msgstr ""
 

-#: ../git-debrebase:2867
+#: ../git-debrebase:2801

 #, perl-format
 msgid " %s: couldn't apply patches: gbp pq %s"
 msgstr ""
 
 #, perl-format
 msgid " %s: couldn't apply patches: gbp pq %s"
 msgstr ""
 

-#: ../git-debrebase:2876
+#: ../git-debrebase:2810

 #, perl-format
 msgid " %s: applying patches gives different tree\n"
 msgstr ""
 
 #, perl-format
 msgid " %s: applying patches gives different tree\n"
 msgstr ""
 

-#: ../git-debrebase:2890
+#: ../git-debrebase:2824

 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 ""
 
 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:2896
+#: ../git-debrebase:2830

 #, perl-format
 msgid "Yes, will base new branch on %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Yes, will base new branch on %s\n"
 msgstr ""
 

-#: ../git-debrebase:2903
+#: ../git-debrebase:2837

 msgid "forget-was-ever-debrebase takes no further arguments"
 msgstr ""
 
 msgid "forget-was-ever-debrebase takes no further arguments"
 msgstr ""
 

-#: ../git-debrebase:2907
+#: ../git-debrebase:2841

 #, perl-format
 msgid "Not suitable for recording git-debrebaseness anyway: %s"
 msgstr ""
 
 #, perl-format
 msgid "Not suitable for recording git-debrebaseness anyway: %s"
 msgstr ""
 

-#: ../git-debrebase:3009
+#: ../git-debrebase:2943

 msgid "bad options\n"
 msgstr ""
 
 msgid "bad options\n"
 msgstr ""
 

-#: ../git-debrebase:3019
+#: ../git-debrebase:2953

 #, perl-format
 msgid "%s: no cuddling to -i for git-rebase"
 msgstr ""
 
 #, perl-format
 msgid "%s: no cuddling to -i for git-rebase"
 msgstr ""
 

-#: ../git-debrebase:3049
+#: ../git-debrebase:2983

 #, perl-format
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown git-debrebase sub-operation %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:293

 #, perl-format
 msgid "error: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "error: %s\n"
 msgstr ""
 

-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:319

 #, perl-format
 msgid "getcwd failed: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "getcwd failed: %s\n"
 msgstr ""
 

-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:338

 msgid "terminated, reporting successful completion"
 msgstr ""
 
 msgid "terminated, reporting successful completion"
 msgstr ""
 

-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:340

 #, perl-format
 msgid "failed with error exit status %s"
 msgstr ""
 
 #, perl-format
 msgid "failed with error exit status %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:343

 #, perl-format
 msgid "died due to fatal signal %s"
 msgstr ""
 
 #, perl-format
 msgid "died due to fatal signal %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:347

 #, perl-format
 msgid "failed with unknown wait status %s"
 msgstr ""
 
 #, perl-format
 msgid "failed with unknown wait status %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:353

 msgid "failed command"
 msgstr ""
 
 msgid "failed command"
 msgstr ""
 

-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:359

 #, perl-format
 msgid "failed to fork/exec: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to fork/exec: %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:361

 #, perl-format
 msgid "subprocess %s"
 msgstr ""
 
 #, perl-format
 msgid "subprocess %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:363

 msgid "subprocess produced invalid output"
 msgstr ""
 
 msgid "subprocess produced invalid output"
 msgstr ""
 

-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:454

 msgid "stat source file: %S"
 msgstr ""
 
 msgid "stat source file: %S"
 msgstr ""
 

-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:464

 msgid "stat destination file: %S"
 msgstr ""
 
 msgid "stat destination file: %S"
 msgstr ""
 

-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:483

 msgid "finally install file after cp: %S"
 msgstr ""
 
 msgid "finally install file after cp: %S"
 msgstr ""
 

-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:489

 msgid "delete old file after cp: %S"
 msgstr ""
 
 msgid "delete old file after cp: %S"
 msgstr ""
 

-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:510

 msgid ""
 "not in a git working tree?\n"
 "(git rev-parse --show-toplevel produced no output)\n"
 msgstr ""
 
 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:513

 #, perl-format
 msgid "chdir toplevel %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "chdir toplevel %s: %s\n"
 msgstr ""
 

-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:621

 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 
 msgid "git index contains changes (does not match HEAD)"
 msgstr ""
 

-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:622

 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 
 msgid "working tree is dirty (does not match HEAD)"
 msgstr ""
 

-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:644
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:650
+#, 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:656 ../Debian/Dgit.pm:658
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:764

 msgid "detached HEAD"
 msgstr ""
 
 msgid "detached HEAD"
 msgstr ""
 

-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:765

 msgid "HEAD symref is not to refs/"
 msgstr ""
 
 msgid "HEAD symref is not to refs/"
 msgstr ""
 

-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:781

 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 
 #, perl-format
 msgid "parsing of %s failed"
 msgstr ""
 

-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:790

 #, 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 ""
 
 #, 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:804

 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 
 #, perl-format
 msgid "open %s (%s): %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:825

 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 
 #, perl-format
 msgid "missing field %s in %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:911

 msgid "Dummy commit - do not use\n"
 msgstr ""
 
 msgid "Dummy commit - do not use\n"
 msgstr ""
 

-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:932

 #, perl-format
 msgid "exec %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "exec %s: %s\n"
 msgstr ""
 

-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1000

 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 
 #, perl-format
 msgid "cannot stat %s/.git: %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1023

 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to mkdir playground parent %s: %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1031

 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to mkdir a playground %s: %s"
 msgstr ""
 

-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1040

 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""
 #, perl-format
 msgid "failed to mkdir the playground %s: %s"
 msgstr ""