msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2020-02-02 16:50+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:241
+#: ../dgit:268
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:248
+#: ../dgit:275
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:256
+#: ../dgit:283
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:261
+#: ../dgit:288
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:484
+#: ../dgit:520
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:489 ../dgit:495
+#: ../dgit:525 ../dgit:531
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:490
+#: ../dgit:526
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:498
+#: ../dgit:534
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:505
+#: ../dgit:541
msgid "protocol message"
msgstr ""
-#: ../dgit:513
+#: ../dgit:549
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:534
+#: ../dgit:570
msgid "bad byte count"
msgstr ""
-#: ../dgit:537
+#: ../dgit:573
msgid "data block"
msgstr ""
-#: ../dgit:618
-#, perl-format
-msgid "failed to fetch %s: %s"
-msgstr ""
-
-#: ../dgit:630
+#: ../dgit:652
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:632
+#: ../dgit:654
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:657
+#: ../dgit:679
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:676
+#: ../dgit:698
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:680
+#: ../dgit:702
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:685
+#: ../dgit:707
msgid "too few arguments"
msgstr ""
-#: ../dgit:796
+#: ../dgit:823
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:799
+#: ../dgit:826
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:819
+#: ../dgit:846
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:860
+#: ../dgit:903
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:875
+#: ../dgit:918
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:891
+#: ../dgit:934
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:911
+#: ../dgit:954
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:972
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211
msgid "internal error"
msgstr ""
-#: ../dgit:922
+#: ../dgit:979
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:926
+#: ../dgit:983
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:1091
-msgid "this operation does not support multiple comma-separated suites"
-msgstr ""
-
-#: ../dgit:1137
+#: ../dgit:1006
#, perl-format
msgid ""
-"config requested specific TLS key but do not know how to get curl to use "
-"exactly that EE key (%s)"
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
msgstr ""
-#: ../dgit:1158
-msgid "ftpmasterapi archive query method takes no data part"
+#: ../dgit:1169
+msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:1166
-msgid "curl failed to print 3-digit HTTP code"
+#: ../dgit:1237
+#, perl-format
+msgid "fetch of %s failed (%s): %s"
msgstr ""
-#: ../dgit:1170
+#: ../dgit:1244
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:1186
+#: ../dgit:1265
+msgid "ftpmasterapi archive query method takes no data part"
+msgstr ""
+
+#: ../dgit:1283
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:1190
+#: ../dgit:1287
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:1192
+#: ../dgit:1289
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:1194
+#: ../dgit:1291
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:1196 ../dgit:1221
+#: ../dgit:1293 ../dgit:1318
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1210
+#: ../dgit:1307
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1212
+#: ../dgit:1309
msgid "bad component"
msgstr ""
-#: ../dgit:1215
+#: ../dgit:1312
msgid "bad filename"
msgstr ""
-#: ../dgit:1217
+#: ../dgit:1314
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:1268
+#: ../dgit:1365
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:1352
+#: ../dgit:1449
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:1374
+#: ../dgit:1473
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:1402
+#: ../dgit:1499
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:1403
+#: ../dgit:1500
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1508
+#: ../dgit:1605
#, 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:1699
+#: ../dgit:1744
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:1702
+#: ../dgit:1747
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:1704
+#: ../dgit:1749
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:1724
+#: ../dgit:1769
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:1730
+#: ../dgit:1775
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1757
+#: ../dgit:1802
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:1774
-msgid "unexpected results from git check query - "
-msgstr ""
-
-#: ../dgit:1789
+#: ../dgit:1825
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:1804
+#: ../dgit:1840
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:1841
+#: ../dgit:1877
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:1887
+#: ../dgit:1923
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:1898
+#: ../dgit:1934
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:1944
+#: ../dgit:1980
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:1953
+#: ../dgit:1989
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:1957
+#: ../dgit:1993
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:1963
+#: ../dgit:1999
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:2003
+#: ../dgit:2039
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:2016
+#: ../dgit:2052
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:2029
+#: ../dgit:2065
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:2045
+#: ../dgit:2081
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:2050
+#: ../dgit:2086
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:2058
+#: ../dgit:2094
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2065
+#: ../dgit:2101
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:2093
+#: ../dgit:2129
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:2101
+#: ../dgit:2137
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:2104
+#: ../dgit:2140
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:2128
+#: ../dgit:2159
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:2151
+#: ../dgit:2182
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
"\n"
msgstr ""
-#: ../dgit:2163
+#: ../dgit:2194
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:2194
+#: ../dgit:2225
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:2196
+#: ../dgit:2227
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:2198
+#: ../dgit:2229
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2203
+#: ../dgit:2234
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:2228
+#: ../dgit:2259
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:2232
+#: ../dgit:2263
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:2234
+#: ../dgit:2265
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:2237
+#: ../dgit:2268
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:2246
+#: ../dgit:2277
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:2250
+#: ../dgit:2281
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:2253
+#: ../dgit:2284
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:2259
+#: ../dgit:2290
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:2291 ../dgit:2296
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2311 ../dgit:2318
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2383
+#: ../dgit:2361
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2447 ../dgit:5971
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2465
+#: ../dgit:2423
msgid "package changelog"
msgstr ""
-#: ../dgit:2505
+#: ../dgit:2463
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2524
+#: ../dgit:2532 ../dgit:2537
+#, perl-format
+msgid "accessing %s: %s"
+msgstr ""
+
+#: ../dgit:2552 ../dgit:2559
#, perl-format
-msgid "Import %s"
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2585 ../dgit:6078
+msgid "source package"
msgstr ""
-#: ../dgit:2605
+#: ../dgit:2665
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2624
+#: ../dgit:2684
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2633
+#: ../dgit:2693
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2648
+#: ../dgit:2713
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2652
+#: ../dgit:2717
msgid "Import of source package"
msgstr ""
-#: ../dgit:2665
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2669
+#: ../dgit:2737
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:2711
+#: ../dgit:2779
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2715
+#: ../dgit:2783
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2719
+#: ../dgit:2787
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2735
+#: ../dgit:2803
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2830
+#: ../dgit:2898
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2845
+#: ../dgit:2913
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2889
+#: ../dgit:2957
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2904
+#: ../dgit:2972
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:2909
+#: ../dgit:2977
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2976
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3025
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3029
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3036
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3038
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3060
+#: ../dgit:3124
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:3065
+#: ../dgit:3129
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:3070
+#: ../dgit:3134
#, 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:3080
+#: ../dgit:3144
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3100
+#: ../dgit:3164
msgid "rewrite map"
msgstr ""
-#: ../dgit:3107
+#: ../dgit:3171
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3111
+#: ../dgit:3175
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3113
+#: ../dgit:3177
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3120
+#: ../dgit:3184
msgid "additional commits"
msgstr ""
-#: ../dgit:3123
+#: ../dgit:3187
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3148
+#: ../dgit:3212
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3152
+#: ../dgit:3216
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3235
+#: ../dgit:3299
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3242
+#: ../dgit:3306
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3247
+#: ../dgit:3311
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3275
+#: ../dgit:3339
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3288
+#: ../dgit:3352
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3291
+#: ../dgit:3355
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3312
+#: ../dgit:3376
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3321
+#: ../dgit:3385
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3406
+#: ../dgit:3470
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
"Record that\n"
msgstr ""
-#: ../dgit:3419
+#: ../dgit:3483
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3437
+#: ../dgit:3501
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3439
+#: ../dgit:3503
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3450
+#: ../dgit:3514
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3465
+#: ../dgit:3529
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3501
+#: ../dgit:3565
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3566
+#: ../dgit:3630
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3580
+#: ../dgit:3644
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3595
+#: ../dgit:3659
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3622
+#: ../dgit:3686
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
"tree.\n"
msgstr ""
-#: ../dgit:3644
+#: ../dgit:3708
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3652
+#: ../dgit:3716
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3691
+#: ../dgit:3755
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3723
+#: ../dgit:3787
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3725
+#: ../dgit:3789
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3764
+#: ../dgit:3828
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
"Input branches:\n"
msgstr ""
-#: ../dgit:3778
+#: ../dgit:3842
msgid ""
"\n"
"Key\n"
"\n"
msgstr ""
-#: ../dgit:3793
+#: ../dgit:3857
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3811
+#: ../dgit:3875
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3819
+#: ../dgit:3893
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3834
+#: ../dgit:3908
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3850
+#: ../dgit:3920
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3854
+#: ../dgit:3923
msgid "starting new git history"
msgstr ""
-#: ../dgit:3880
+#: ../dgit:3948
#, 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:3885
+#: ../dgit:3953
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3897
+#: ../dgit:3965
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3899
+#: ../dgit:3967
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3907
+#: ../dgit:3975
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3918
+#: ../dgit:3986
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3937
+#: ../dgit:4005
#, 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:3954
+#: ../dgit:4022
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3957
+#: ../dgit:4025
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3961
+#: ../dgit:4029
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:4004
+#: ../dgit:4073
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:4009
+#: ../dgit:4078
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:4019
+#: ../dgit:4088
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:4025
+#: ../dgit:4094
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4051
+#: ../dgit:4120
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4054
+#: ../dgit:4123
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4062
+#: ../dgit:4131
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:4071
+#: ../dgit:4140
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4080
+#: ../dgit:4149
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4088
+#: ../dgit:4157
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4098
+#: ../dgit:4168
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4101
+#: ../dgit:4171
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4115
+#: ../dgit:4185
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4171
+#: ../dgit:4241
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4180
+#: ../dgit:4250
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4182
+#: ../dgit:4252
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4183
+#: ../dgit:4253
msgid "current archive contents"
msgstr ""
-#: ../dgit:4196
+#: ../dgit:4266
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4206
+#: ../dgit:4276
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4207
+#: ../dgit:4277
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4211
+#: ../dgit:4281
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4224
+#: ../dgit:4294
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4232
+#: ../dgit:4302
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4244
+#: ../dgit:4314
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4266
+#: ../dgit:4336
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4327
+#: ../dgit:4390
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4355
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4368
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4420
-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:4429
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4434
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4457
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4474
-#, 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:4498
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4529
-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:4539
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4573 ../dgit:4585
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4579
-#, 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:4589
-#, 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:4600
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4622
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4626
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4630
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4637
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4681
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4694
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4711
-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:4728
-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:4759
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4771
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4782
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4788 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4802
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4806
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4844
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4861
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4870
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4932
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4937
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4942
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4957
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4968
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5006
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5086
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5123
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5126
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5135
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5143
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5149
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5168
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5213
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5257
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5332
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5338
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5339
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5346
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5376
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5405
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5412
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5418
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5425
-#, 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:5432
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5441
-#, 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:5450
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5455
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5460
-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:5482
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5496
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5497
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5562
+#: ../dgit:5650
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5580
+#: ../dgit:5668
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5589
+#: ../dgit:5677
msgid "root commit"
msgstr ""
-#: ../dgit:5595
+#: ../dgit:5683
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5607
+#: ../dgit:5695
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5626
+#: ../dgit:5714
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5633
+#: ../dgit:5721
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5645
+#: ../dgit:5733
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5648
+#: ../dgit:5736
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5660
+#: ../dgit:5748
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
"\n"
msgstr ""
-#: ../dgit:5667
+#: ../dgit:5755
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5701
+#: ../dgit:5789
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5702
+#: ../dgit:5790
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5703
+#: ../dgit:5791
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5704
+#: ../dgit:5792
msgid "is series file\n"
msgstr ""
-#: ../dgit:5705
+#: ../dgit:5793
msgid "too long\n"
msgstr ""
-#: ../dgit:5709
+#: ../dgit:5797
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5738
+#: ../dgit:5826
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5881
+#: ../dgit:5909
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5927
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5928
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5982
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5891
+#: ../dgit:5992
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5993
+#: ../dgit:6102
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6024
+#: ../dgit:6134
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6029
+#: ../dgit:6139
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:6040
+#: ../dgit:6174
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6131
+#: ../dgit:6288
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"
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6145
+#: ../dgit:6302
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6182
+#: ../dgit:6336
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6349
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6367
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6383
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6397
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6421
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6185
+#: ../dgit:6431
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6191
+#: ../dgit:6440
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6195
+#: ../dgit:6444
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6202
+#: ../dgit:6451
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6455
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6205
+#: ../dgit:6458
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6208
+#: ../dgit:6461
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6211
+#: ../dgit:6464
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6215
+#: ../dgit:6468
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6224
+#: ../dgit:6479
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6262
+#: ../dgit:6518
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
"\n"
msgstr ""
-#: ../dgit:6274
+#: ../dgit:6530
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6303
+#: ../dgit:6559
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:6315
+#: ../dgit:6571
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6318
+#: ../dgit:6574
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6321
+#: ../dgit:6577
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:6339
+#: ../dgit:6590
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6607
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6353
+#: ../dgit:6621
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6366
+#: ../dgit:6640
+#, perl-format
+msgid "-p specified package %s, but changelog says %s"
+msgstr ""
+
+#: ../dgit:6650
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6659
#, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6663
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
-#: ../dgit:6405
+#: ../dgit:6698
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6407
+#: ../dgit:6700
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6433
+#: ../dgit:6718
+#, perl-format
+msgid "warning: dgit option %s must be passed before %s on dgit command line\n"
+msgstr ""
+
+#: ../dgit:6725
+#, perl-format
+msgid ""
+"warning: option %s should probably be passed to dgit before %s sub-command "
+"on the dgit command line, so that it is seen by dgit and not simply passed "
+"to %s\n"
+msgstr ""
+
+#: ../dgit:6751
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6439
+#: ../dgit:6757
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6760
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6485
+#: ../dgit:6803
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6523
+#: ../dgit:6841
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6530
+#: ../dgit:6848
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6537
+#: ../dgit:6855
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6541
+#: ../dgit:6859
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6546
+#: ../dgit:6864
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6549
+#: ../dgit:6867
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6562
+#: ../dgit:6880
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6580
+#: ../dgit:6898
msgid "build successful\n"
msgstr ""
-#: ../dgit:6587
+#: ../dgit:6906
#, 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:6697
+#: ../dgit:7017
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6732
+#: ../dgit:7054
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6752
+#: ../dgit:7074
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6765
+#: ../dgit:7087
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6769
+#: ../dgit:7091
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6776
+#: ../dgit:7098
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6782
+#: ../dgit:7104
msgid "source changes file"
msgstr ""
-#: ../dgit:6784
+#: ../dgit:7106
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6804 ../dgit:6806
+#: ../dgit:7126 ../dgit:7128
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6819
+#: ../dgit:7142
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:6831
+#: ../dgit:7155
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6835
+#: ../dgit:7159
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:6865
+#: ../dgit:7189
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6887
+#: ../dgit:7210
msgid "source tree"
msgstr ""
-#: ../dgit:6889
+#: ../dgit:7212
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6902
+#: ../dgit:7225
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6906
+#: ../dgit:7229
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6910
+#: ../dgit:7233
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6927
+#: ../dgit:7250
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6932
+#: ../dgit:7255
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6934
+#: ../dgit:7257
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6945
+#: ../dgit:7268
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7271
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6959
+#: ../dgit:7282
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6970
+#: ../dgit:7293
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6979
+#: ../dgit:7302
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6986
+#: ../dgit:7309
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6988
+#: ../dgit:7311
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6993
+#: ../dgit:7316
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:6998
+#: ../dgit:7321
#, perl-format
msgid ""
"Branch %s already exists\n"
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7016
+#: ../dgit:7341
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7018
+#: ../dgit:7343
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7037
+#: ../dgit:7351
+#, perl-format
+msgid "import %s requires %s, but: %s"
+msgstr ""
+
+#: ../dgit:7370
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:7041
+#: ../dgit:7374
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:7042
+#: ../dgit:7375
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:7053
+#: ../dgit:7386
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:7055
+#: ../dgit:7388
msgid "Import, merging."
msgstr ""
-#: ../dgit:7069
+#: ../dgit:7402
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7078
+#: ../dgit:7411
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7085
+#: ../dgit:7418
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7091
-#, perl-format
-msgid "exec curl: %s\n"
-msgstr ""
-
-#: ../dgit:7105
+#: ../dgit:7436
msgid "need destination argument"
msgstr ""
-#: ../dgit:7110
+#: ../dgit:7441
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7118
+#: ../dgit:7449
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7129
+#: ../dgit:7460
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7135
+#: ../dgit:7466
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7142 ../dgit:7148
+#: ../dgit:7473 ../dgit:7479
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7154
+#: ../dgit:7485
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7201
+#: ../dgit:7532
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7240
+#: ../dgit:7571
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7244
+#: ../dgit:7575
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7335
+#: ../dgit:7675
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7355
+#: ../dgit:7693
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7410
+#: ../dgit:7748
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7425
+#: ../dgit:7763
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7429
+#: ../dgit:7767
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7435
+#: ../dgit:7773
#, perl-format
msgid ""
"On entry to dgit, %s\n"
"Giving up.\n"
msgstr ""
-#: ../dgit:7452
+#: ../dgit:7790
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7465
+#: ../dgit:7803
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7485
+#: ../dgit:7823
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7495
+#: ../dgit:7834
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7500
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7511
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7532
+#: ../dgit:7862
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7533
+#: ../dgit:7863
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7552
+#: ../dgit:7882
#, perl-format
msgid "unknown operation %s"
msgstr ""
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr ""
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr ""
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr ""
-#: ../git-debrebase:401
+#: ../git-debrebase:363
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:404
+#: ../git-debrebase:366
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:417
+#: ../git-debrebase:379
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
-#: ../git-debrebase:423
+#: ../git-debrebase:385
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr ""
-#: ../git-debrebase:427
+#: ../git-debrebase:389
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
-#: ../git-debrebase:459
+#: ../git-debrebase:421
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
msgstr ""
-#: ../git-debrebase:466
+#: ../git-debrebase:428
#, perl-format
msgid ""
"%s\n"
"Is this meant to be a gdr branch? %s\n"
msgstr ""
-#: ../git-debrebase:471
+#: ../git-debrebase:433
#, perl-format
msgid ""
"%s\n"
"Consider git-debrebase scrap, to throw away your recent work.\n"
msgstr ""
-#: ../git-debrebase:477
+#: ../git-debrebase:439
#, perl-format
msgid ""
"%s\n"
"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
msgstr ""
-#: ../git-debrebase:488
+#: ../git-debrebase:450
#, perl-format
msgid ""
"%s\n"
"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
msgstr ""
-#: ../git-debrebase:935
+#: ../git-debrebase:897
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr ""
-#: ../git-debrebase:937
+#: ../git-debrebase:899
msgid "has other than two parents"
msgstr ""
-#: ../git-debrebase:938
+#: ../git-debrebase:900
msgid "contains debian/patches"
msgstr ""
-#: ../git-debrebase:964
+#: ../git-debrebase:926
msgid "is an origin commit"
msgstr ""
-#: ../git-debrebase:966
+#: ../git-debrebase:928
msgid "upstream files differ from left parent"
msgstr ""
-#: ../git-debrebase:968
+#: ../git-debrebase:930
msgid "debian/ differs from right parent"
msgstr ""
-#: ../git-debrebase:979
+#: ../git-debrebase:941
msgid "edits debian/patches"
msgstr ""
-#: ../git-debrebase:991
+#: ../git-debrebase:953
msgid "parent's debian is not a directory"
msgstr ""
-#: ../git-debrebase:998
+#: ../git-debrebase:960
msgid "no changes"
msgstr ""
-#: ../git-debrebase:1004
+#: ../git-debrebase:966
msgid "origin commit"
msgstr ""
-#: ../git-debrebase:1055
+#: ../git-debrebase:1017
#, perl-format
msgid "unknown kind of merge from %s"
msgstr ""
-#: ../git-debrebase:1058
+#: ../git-debrebase:1020
msgid "octopus merge"
msgstr ""
-#: ../git-debrebase:1062
+#: ../git-debrebase:1024
msgid "general two-parent merge"
msgstr ""
-#: ../git-debrebase:1079
+#: ../git-debrebase:1041
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr ""
-#: ../git-debrebase:1119
+#: ../git-debrebase:1081
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr ""
-#: ../git-debrebase:1147
+#: ../git-debrebase:1109
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr ""
-#: ../git-debrebase:1148
+#: ../git-debrebase:1110
#, perl-format
msgid " (eg %s)"
msgstr ""
-#: ../git-debrebase:1154
+#: ../git-debrebase:1116
msgid "found mixed upstream/packaging commit"
msgstr ""
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130
+#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149
#, perl-format
msgid " (%s)"
msgstr ""
-#: ../git-debrebase:1162
+#: ../git-debrebase:1124
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr ""
-#: ../git-debrebase:1167
+#: ../git-debrebase:1129
msgid "found dgit dsc import"
msgstr ""
-#: ../git-debrebase:1172
+#: ../git-debrebase:1134
msgid "found bare dgit dsc import with no prior history"
msgstr ""
-#: ../git-debrebase:1178
+#: ../git-debrebase:1140
msgid "found vanilla merge"
msgstr ""
-#: ../git-debrebase:1185
+#: ../git-debrebase:1147
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr ""
-#: ../git-debrebase:1253
+#: ../git-debrebase:1215
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1254
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1375
+#: ../git-debrebase:1337
msgid "bare dgit dsc import"
msgstr ""
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1677 ../git-debrebase:1680
#, perl-format
msgid "mismatch %s ?"
msgstr ""
-#: ../git-debrebase:1721
+#: ../git-debrebase:1683
#, perl-format
msgid "mismatch %s != %s ?"
msgstr ""
-#: ../git-debrebase:1731
+#: ../git-debrebase:1693
#, perl-format
msgid "internal error %#x %s %s"
msgstr ""
-#: ../git-debrebase:1759
+#: ../git-debrebase:1721
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr ""
-#: ../git-debrebase:1773
+#: ../git-debrebase:1735
msgid "you are in the middle of a git-rebase already"
msgstr ""
-#: ../git-debrebase:1799
+#: ../git-debrebase:1761
msgid "launder for rebase"
msgstr ""
-#: ../git-debrebase:1804
+#: ../git-debrebase:1766
msgid "analyse does not support any options"
msgstr ""
-#: ../git-debrebase:1806
+#: ../git-debrebase:1768
msgid "too many arguments to analyse"
msgstr ""
-#: ../git-debrebase:1841
+#: ../git-debrebase:1801
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1803
msgid "HEAD symref is not to refs/heads/"
msgstr ""
-#: ../git-debrebase:1864
+#: ../git-debrebase:1826
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr ""
-#: ../git-debrebase:1868
+#: ../git-debrebase:1830
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr ""
-#: ../git-debrebase:1872
+#: ../git-debrebase:1834
#, perl-format
msgid "you have diverged from %s"
msgstr ""
-#: ../git-debrebase:1894
+#: ../git-debrebase:1856
msgid "remote dgit branch"
msgstr ""
-#: ../git-debrebase:1897
+#: ../git-debrebase:1859
msgid "remote dgit branch for sid"
msgstr ""
-#: ../git-debrebase:1925
+#: ../git-debrebase:1887
msgid "Recorded previous head for preservation"
msgstr ""
-#: ../git-debrebase:1933
+#: ../git-debrebase:1895
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1944
+#: ../git-debrebase:1906
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1964
+#: ../git-debrebase:1926
msgid "fast forward"
msgstr ""
-#: ../git-debrebase:1974
+#: ../git-debrebase:1936
msgid "Declare fast forward / record previous work"
msgstr ""
-#: ../git-debrebase:1986
+#: ../git-debrebase:1948
msgid "No ffq-prev to stitch."
msgstr ""
-#: ../git-debrebase: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:1965
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr ""
-#: ../git-debrebase:2038
+#: ../git-debrebase:1970
#, perl-format
msgid "bad version number `%s'"
msgstr ""
-#: ../git-debrebase:2055
+#: ../git-debrebase:1988
#, perl-format
msgid "upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2056
+#: ../git-debrebase:1989
msgid "upstream (main piece"
msgstr ""
-#: ../git-debrebase:2076
+#: ../git-debrebase:2009
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr ""
-#: ../git-debrebase:2094
+#: ../git-debrebase:2027
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr "old anchor is recognized due to --anchor, cannot check upstream"
-#: ../git-debrebase:2110
+#: ../git-debrebase:2043
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"but has %d parents (one per piece plus maybe a previous combine)"
msgstr ""
-#: ../git-debrebase:2119
+#: ../git-debrebase:2052
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
-#: ../git-debrebase:2132
+#: ../git-debrebase:2065
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"commit"
msgstr ""
-#: ../git-debrebase:2143
+#: ../git-debrebase:2076
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2146
+#: ../git-debrebase:2079
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2149
+#: ../git-debrebase:2082
#, perl-format
msgid "not fast forward: %s %s"
msgstr ""
-#: ../git-debrebase:2260
+#: ../git-debrebase:2193
msgid "Previous head already recorded\n"
msgstr ""
-#: ../git-debrebase:2264
+#: ../git-debrebase:2197
#, 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:2202 ../git-debrebase:2208 ../git-debrebase:2214
+#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337
+#: ../git-debrebase:2401
msgid "no arguments allowed"
msgstr ""
-#: ../git-debrebase:2303
+#: ../git-debrebase:2236
msgid "branch contains furniture (not laundered)"
msgstr ""
-#: ../git-debrebase:2304
+#: ../git-debrebase:2237
msgid "branch is unlaundered"
msgstr ""
-#: ../git-debrebase:2305
+#: ../git-debrebase:2238
msgid "branch needs laundering"
msgstr ""
-#: ../git-debrebase:2306
+#: ../git-debrebase:2239
msgid "branch not in git-debrebase form"
msgstr ""
-#: ../git-debrebase:2316
+#: ../git-debrebase:2249
msgid "current branch contents, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2318
+#: ../git-debrebase:2251
msgid " branch is laundered\n"
msgstr ""
-#: ../git-debrebase:2334
+#: ../git-debrebase:2267
#, perl-format
msgid " %s is not well-defined\n"
msgstr ""
-#: ../git-debrebase:2340
+#: ../git-debrebase:2273
msgid "key git-debrebase commits:\n"
msgstr ""
-#: ../git-debrebase:2341
+#: ../git-debrebase:2274
msgid "anchor"
msgstr ""
-#: ../git-debrebase:2342
+#: ../git-debrebase:2275
msgid "breakwater"
msgstr ""
-#: ../git-debrebase:2347
+#: ../git-debrebase:2280
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2354
+#: ../git-debrebase:2287
msgid " unstitched; previous tip was:\n"
msgstr ""
-#: ../git-debrebase:2357
+#: ../git-debrebase:2290
msgid " stitched? (no record of git-debrebase work)\n"
msgstr ""
-#: ../git-debrebase:2359
+#: ../git-debrebase:2292
msgid " stitched\n"
msgstr ""
-#: ../git-debrebase:2361
+#: ../git-debrebase:2294
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr ""
-#: ../git-debrebase:2364
+#: ../git-debrebase:2297
msgid "you are currently rebasing\n"
msgstr ""
-#: ../git-debrebase:2381 ../git-debrebase:2394
+#: ../git-debrebase:2314 ../git-debrebase:2327
msgid "launder for git-debrebase quick"
msgstr ""
-#: ../git-debrebase:2388 ../git-debrebase:2418
+#: ../git-debrebase:2321 ../git-debrebase:2351
msgid "No ongoing git-debrebase session."
msgstr ""
-#: ../git-debrebase:2457
+#: ../git-debrebase:2390
msgid "Commit patch queue (exported by git-debrebase)"
msgstr ""
-#: ../git-debrebase:2474
+#: ../git-debrebase:2407
msgid "No (more) patches to export."
msgstr ""
-#: ../git-debrebase:2481
+#: ../git-debrebase:2414
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"laundering first."
msgstr ""
-#: ../git-debrebase:2501
+#: ../git-debrebase:2434
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr ""
-#: ../git-debrebase:2506
+#: ../git-debrebase:2439
#, perl-format
msgid "patch %s repeated in %s !"
msgstr ""
-#: ../git-debrebase:2513
+#: ../git-debrebase:2446
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr ""
-#: ../git-debrebase:2521
+#: ../git-debrebase:2454
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2526
+#: ../git-debrebase:2459
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2542
+#: ../git-debrebase:2475
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2547
+#: ../git-debrebase:2480
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2563
+#: ../git-debrebase:2496
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2571
+#: ../git-debrebase:2504
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2578
+#: ../git-debrebase:2511
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"files - are you sure this is a gbp (patches-unapplied) branch?"
msgstr ""
-#: ../git-debrebase:2580
+#: ../git-debrebase:2513
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2587
+#: ../git-debrebase:2520
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2605
+#: ../git-debrebase:2538
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2611
+#: ../git-debrebase:2544
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2614
+#: ../git-debrebase:2547
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2617
+#: ../git-debrebase:2550
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2619
+#: ../git-debrebase:2552
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2621
+#: ../git-debrebase:2554
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2628
+#: ../git-debrebase:2561
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2674
+#: ../git-debrebase:2607
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2703
+#: ../git-debrebase:2636
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2724
+#: ../git-debrebase:2657
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2732
+#: ../git-debrebase:2665
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2746
+#: ../git-debrebase:2679
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2750
+#: ../git-debrebase:2683
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2762
+#: ../git-debrebase:2695
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2769
+#: ../git-debrebase:2702
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2775
+#: ../git-debrebase:2708
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2784
+#: ../git-debrebase:2717
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2790
+#: ../git-debrebase:2723
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2821
+#: ../git-debrebase:2754
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2830
+#: ../git-debrebase:2763
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2867
+#: ../git-debrebase:2800
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2876
+#: ../git-debrebase:2809
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2890
+#: ../git-debrebase:2823
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"upstream commmit explicitly or provide suitable origs.\n"
msgstr ""
-#: ../git-debrebase:2896
+#: ../git-debrebase:2829
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2903
+#: ../git-debrebase:2836
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2907
+#: ../git-debrebase:2840
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3009
+#: ../git-debrebase:2942
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3019
+#: ../git-debrebase:2952
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3049
+#: ../git-debrebase:2982
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:298
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:324
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:343
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:345
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:348
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:352
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:358
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:364
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:366
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:368
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:459
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:469
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:488
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:494
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:515
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:518
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:626
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:627
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:649
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:655
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:769
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:770
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:786
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:795
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"modify the .dsc and then do the signature itself"
msgstr ""
-#: ../Debian/Dgit.pm:729
+#: ../Debian/Dgit.pm:809
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:830
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:916
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:937
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1005
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1028
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1036
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1045
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
~ianmdlvl / dgit.git / blobdiff