summaryrefslogtreecommitdiff
path: root/po/messages.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po/messages.pot')
-rw-r--r--po/messages.pot736
1 files changed, 393 insertions, 343 deletions
diff --git a/po/messages.pot b/po/messages.pot
index 9506b59..840de39 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-13 19:41+0000\n"
+"POT-Creation-Date: 2019-01-06 17:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
#: ../dgit:260
#, perl-format
-msgid "%s: package %s does not exist in suite %s\n"
+msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
#: ../dgit:483
@@ -440,49 +440,95 @@ msgstr ""
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2218 ../dgit:2223
+#: ../dgit:2202
+#, perl-format
+msgid "build-products-dir %s is not accessible: %s\n"
+msgstr ""
+
+#: ../dgit:2227
+#, perl-format
+msgid ""
+"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
+msgstr ""
+
+#: ../dgit:2231
+#, perl-format
+msgid "check orig file %s in bpd %s: %s"
+msgstr ""
+
+#: ../dgit:2233
+#, perl-format
+msgid "check orig file %s in ..: %s"
+msgstr ""
+
+#: ../dgit:2236
+#, perl-format
+msgid "check targe of orig symlink %s in ..: %s"
+msgstr ""
+
+#: ../dgit:2245
+#, perl-format
+msgid "%s: cloned orig symlink from ..: %s\n"
+msgstr ""
+
+#: ../dgit:2249
+#, perl-format
+msgid "%s: hardlinked orig from ..: %s\n"
+msgstr ""
+
+#: ../dgit:2252
+#, perl-format
+msgid "failed to make %s a hardlink to %s: %s"
+msgstr ""
+
+#: ../dgit:2258
+#, 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:2238 ../dgit:2245
+#: ../dgit:2310 ../dgit:2317
#, perl-format
msgid "saving %s: %s"
msgstr ""
-#: ../dgit:2311
+#: ../dgit:2382
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2375 ../dgit:5892
+#: ../dgit:2446 ../dgit:5970
msgid "source package"
msgstr ""
-#: ../dgit:2393
+#: ../dgit:2464
msgid "package changelog"
msgstr ""
-#: ../dgit:2433
+#: ../dgit:2504
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2452
+#: ../dgit:2523
#, perl-format
msgid "Import %s"
msgstr ""
-#: ../dgit:2533
+#: ../dgit:2604
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2552
+#: ../dgit:2623
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2561
+#: ../dgit:2632
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@ -491,21 +537,21 @@ msgid ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2576
+#: ../dgit:2647
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2580
+#: ../dgit:2651
msgid "Import of source package"
msgstr ""
-#: ../dgit:2593
+#: ../dgit:2664
#, perl-format
msgid "Record %s (%s) in archive suite %s\n"
msgstr ""
-#: ../dgit:2597
+#: ../dgit:2668
#, perl-format
msgid ""
"\n"
@@ -514,51 +560,51 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:2639
+#: ../dgit:2710
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2643
+#: ../dgit:2714
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2647
+#: ../dgit:2718
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2663
+#: ../dgit:2734
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2758
+#: ../dgit:2829
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2773
+#: ../dgit:2844
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2817
+#: ../dgit:2888
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2832
+#: ../dgit:2903
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:2837
+#: ../dgit:2908
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@ -568,49 +614,49 @@ msgid ""
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2904
+#: ../dgit:2975
#, perl-format
msgid "Not updating %s from %s to %s.\n"
msgstr ""
-#: ../dgit:2953
+#: ../dgit:3024
#, perl-format
msgid "%s: NO git hash"
msgstr ""
-#: ../dgit:2957
+#: ../dgit:3028
#, perl-format
msgid "%s: specified git info (%s)"
msgstr ""
-#: ../dgit:2964
+#: ../dgit:3035
#, perl-format
msgid "%s: specified git hash"
msgstr ""
-#: ../dgit:2966
+#: ../dgit:3037
#, perl-format
msgid "%s: invalid Dgit info"
msgstr ""
-#: ../dgit:2988
+#: ../dgit:3059
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:2993
+#: ../dgit:3064
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:2998
+#: ../dgit:3069
#, 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:3008
+#: ../dgit:3079
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@ -619,54 +665,54 @@ msgid ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3028
+#: ../dgit:3099
msgid "rewrite map"
msgstr ""
-#: ../dgit:3035
+#: ../dgit:3106
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3039
+#: ../dgit:3110
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3041
+#: ../dgit:3112
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3048
+#: ../dgit:3119
msgid "additional commits"
msgstr ""
-#: ../dgit:3051
+#: ../dgit:3122
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3075
+#: ../dgit:3147
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3079
+#: ../dgit:3151
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3162
+#: ../dgit:3234
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3169
+#: ../dgit:3241
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3174
+#: ../dgit:3246
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3202
+#: ../dgit:3274
#, perl-format
msgid ""
"\n"
@@ -676,15 +722,15 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3215
+#: ../dgit:3287
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3218
+#: ../dgit:3290
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3239
+#: ../dgit:3311
#, perl-format
msgid ""
"\n"
@@ -692,7 +738,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3248
+#: ../dgit:3320
#, perl-format
msgid ""
"\n"
@@ -702,7 +748,7 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3333
+#: ../dgit:3405
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@ -710,19 +756,19 @@ msgid ""
"Record that\n"
msgstr ""
-#: ../dgit:3346
+#: ../dgit:3418
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3364
+#: ../dgit:3436
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3366
+#: ../dgit:3438
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3377
+#: ../dgit:3449
#, perl-format
msgid ""
"\n"
@@ -732,30 +778,30 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3392
+#: ../dgit:3464
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3428
+#: ../dgit:3500
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3493
+#: ../dgit:3565
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3507
+#: ../dgit:3579
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3522
+#: ../dgit:3594
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3549
+#: ../dgit:3621
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@ -763,30 +809,30 @@ msgid ""
"tree.\n"
msgstr ""
-#: ../dgit:3571
+#: ../dgit:3643
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3579
+#: ../dgit:3651
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3618
+#: ../dgit:3690
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3650
+#: ../dgit:3722
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3652
+#: ../dgit:3724
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3691
+#: ../dgit:3763
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@ -794,7 +840,7 @@ msgid ""
"Input branches:\n"
msgstr ""
-#: ../dgit:3705
+#: ../dgit:3777
msgid ""
"\n"
"Key\n"
@@ -803,248 +849,248 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3720
+#: ../dgit:3792
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3738
+#: ../dgit:3810
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3746
+#: ../dgit:3818
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3763
+#: ../dgit:3833
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3774
+#: ../dgit:3849
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3778
+#: ../dgit:3853
msgid "starting new git history"
msgstr ""
-#: ../dgit:3804
+#: ../dgit:3879
#, 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:3809
+#: ../dgit:3884
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3821
+#: ../dgit:3896
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3823
+#: ../dgit:3898
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3831
+#: ../dgit:3906
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3842
+#: ../dgit:3917
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3861
+#: ../dgit:3936
#, 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:3878
+#: ../dgit:3953
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3881
+#: ../dgit:3956
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3885
+#: ../dgit:3960
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:3928
+#: ../dgit:4003
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:3933
+#: ../dgit:4008
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:3943
+#: ../dgit:4018
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:3949
+#: ../dgit:4024
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:3975
+#: ../dgit:4050
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:3978
+#: ../dgit:4053
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:3986
+#: ../dgit:4061
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:3995
+#: ../dgit:4070
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4004
+#: ../dgit:4079
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4012
+#: ../dgit:4087
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4022
+#: ../dgit:4097
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4025
+#: ../dgit:4100
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4039
+#: ../dgit:4114
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4095
+#: ../dgit:4170
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4104
+#: ../dgit:4179
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4106
+#: ../dgit:4181
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4107
+#: ../dgit:4182
msgid "current archive contents"
msgstr ""
-#: ../dgit:4120
+#: ../dgit:4195
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4130
+#: ../dgit:4205
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4131
+#: ../dgit:4206
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4135
+#: ../dgit:4210
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4148
+#: ../dgit:4223
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4156
+#: ../dgit:4231
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4168
+#: ../dgit:4243
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4190
+#: ../dgit:4265
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4251
+#: ../dgit:4326
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4279
+#: ../dgit:4354
#, perl-format
msgid "%s release %s for %s (%s) [dgit]\n"
msgstr ""
-#: ../dgit:4292
+#: ../dgit:4367
#, perl-format
msgid ""
"%s release %s for %s (%s)\n"
"(maintainer view tag generated by dgit --quilt=%s)\n"
msgstr ""
-#: ../dgit:4344
+#: ../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:4353
+#: ../dgit:4428
msgid ""
"package appears to be new in this suite; if this is intentional, use --new"
msgstr ""
-#: ../dgit:4358
+#: ../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:4381
+#: ../dgit:4456
#, perl-format
msgid "looked for .dsc %s, but %s; maybe you forgot to build"
msgstr ""
-#: ../dgit:4398
+#: ../dgit:4473
#, perl-format
msgid ""
"Branch is managed by git-debrebase (%s\n"
@@ -1053,14 +1099,14 @@ msgid ""
"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
msgstr ""
-#: ../dgit:4422
+#: ../dgit:4497
#, perl-format
msgid ""
"--quilt=%s but no cached dgit view:\n"
" perhaps HEAD changed since dgit build[-source] ?"
msgstr ""
-#: ../dgit:4453
+#: ../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"
@@ -1068,24 +1114,24 @@ msgid ""
"forward."
msgstr ""
-#: ../dgit:4463
+#: ../dgit:4538
#, perl-format
msgid "checking that %s corresponds to HEAD"
msgstr ""
-#: ../dgit:4497 ../dgit:4509
+#: ../dgit:4572 ../dgit:4584
#, perl-format
msgid "HEAD specifies a different tree to %s:\n"
msgstr ""
-#: ../dgit:4503
+#: ../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:4513
+#: ../dgit:4588
#, perl-format
msgid ""
"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
@@ -1093,52 +1139,52 @@ msgid ""
" git diff %s %s\n"
msgstr ""
-#: ../dgit:4524
+#: ../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:4546
+#: ../dgit:4621
msgid "uploading binaries, although distro policy is source only"
msgstr ""
-#: ../dgit:4550
+#: ../dgit:4625
msgid "source-only upload, although distro policy requires .debs"
msgstr ""
-#: ../dgit:4554
+#: ../dgit:4629
#, perl-format
msgid ""
"source-only upload, even though package is entirely NEW\n"
"(this is contrary to policy in %s)"
msgstr ""
-#: ../dgit:4561
+#: ../dgit:4636
#, perl-format
msgid "unknown source-only-uploads policy `%s'"
msgstr ""
-#: ../dgit:4605
+#: ../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:4618
+#: ../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:4635
+#: ../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:4652
+#: ../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"
@@ -1147,155 +1193,155 @@ msgid ""
"If you need to change the package, you must use a new version number.\n"
msgstr ""
-#: ../dgit:4683
+#: ../dgit:4758
#, perl-format
msgid "pushed and uploaded %s"
msgstr ""
-#: ../dgit:4695
+#: ../dgit:4770
msgid "-p is not allowed with clone; specify as argument instead"
msgstr ""
-#: ../dgit:4706
+#: ../dgit:4781
msgid "incorrect arguments to dgit clone"
msgstr ""
-#: ../dgit:4712 ../git-debrebase:1839
+#: ../dgit:4787 ../git-debrebase:1839
#, perl-format
msgid "%s already exists"
msgstr ""
-#: ../dgit:4726
+#: ../dgit:4801
#, perl-format
msgid "remove %s: %s\n"
msgstr ""
-#: ../dgit:4730
+#: ../dgit:4805
#, perl-format
msgid "check whether to remove %s: %s\n"
msgstr ""
-#: ../dgit:4768
+#: ../dgit:4843
msgid "incorrect arguments to dgit fetch or dgit pull"
msgstr ""
-#: ../dgit:4785
+#: ../dgit:4860
#, perl-format
msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
msgstr ""
-#: ../dgit:4794
+#: ../dgit:4869
msgid "dgit checkout needs a suite argument"
msgstr ""
-#: ../dgit:4856
+#: ../dgit:4931
#, perl-format
msgid "setting up vcs-git: %s\n"
msgstr ""
-#: ../dgit:4859
+#: ../dgit:4934
#, perl-format
msgid "vcs git already configured: %s\n"
msgstr ""
-#: ../dgit:4861
+#: ../dgit:4936
#, perl-format
msgid "changing vcs-git url to: %s\n"
msgstr ""
-#: ../dgit:4866
+#: ../dgit:4941
#, perl-format
msgid "fetching (%s)\n"
msgstr ""
-#: ../dgit:4881
+#: ../dgit:4956
#, perl-format
msgid "incorrect arguments to dgit %s"
msgstr ""
-#: ../dgit:4892
+#: ../dgit:4967
#, perl-format
msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
msgstr ""
-#: ../dgit:4930
+#: ../dgit:5005
#, perl-format
msgid ""
"build host has dgit rpush protocol versions %s but invocation host has %s"
msgstr ""
-#: ../dgit:5010
+#: ../dgit:5085
#, perl-format
msgid "create %s: %s"
msgstr ""
-#: ../dgit:5047
+#: ../dgit:5122
#, perl-format
msgid "build host child failed: %s"
msgstr ""
-#: ../dgit:5050
+#: ../dgit:5125
msgid "all done\n"
msgstr ""
-#: ../dgit:5059
+#: ../dgit:5134
#, perl-format
msgid "file %s (%s) twice"
msgstr ""
-#: ../dgit:5067
+#: ../dgit:5142
msgid "bad param spec"
msgstr ""
-#: ../dgit:5073
+#: ../dgit:5148
msgid "bad previously spec"
msgstr ""
-#: ../dgit:5092
+#: ../dgit:5167
#, perl-format
msgid ""
"rpush negotiated protocol version %s which does not support quilt mode %s"
msgstr ""
-#: ../dgit:5137
+#: ../dgit:5212
#, perl-format
msgid "buildinfo mismatch in field %s"
msgstr ""
-#: ../dgit:5140
+#: ../dgit:5215
#, perl-format
msgid "buildinfo contains forbidden field %s"
msgstr ""
-#: ../dgit:5181
+#: ../dgit:5256
msgid "remote changes file"
msgstr ""
-#: ../dgit:5256
+#: ../dgit:5331
msgid "not a plain file or symlink\n"
msgstr ""
-#: ../dgit:5262
+#: ../dgit:5337
msgid "mode or type changed\n"
msgstr ""
-#: ../dgit:5263
+#: ../dgit:5338
msgid "modified symlink\n"
msgstr ""
-#: ../dgit:5266
+#: ../dgit:5341
msgid "deletion of symlink\n"
msgstr ""
-#: ../dgit:5270
+#: ../dgit:5345
msgid "creation with non-default mode\n"
msgstr ""
-#: ../dgit:5300
+#: ../dgit:5375
msgid "dgit view: changes are required..."
msgstr ""
-#: ../dgit:5329
+#: ../dgit:5404
#, perl-format
msgid ""
"\n"
@@ -1303,31 +1349,31 @@ msgid ""
" %s\n"
msgstr ""
-#: ../dgit:5336
+#: ../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:5342
+#: ../dgit:5417
msgid ""
"\n"
" ... debian/patches is missing; perhaps this is a patch queue branch?"
msgstr ""
-#: ../dgit:5349
+#: ../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:5356
+#: ../dgit:5431
msgid "dgit view: creating patches-applied version using gbp pq"
msgstr ""
-#: ../dgit:5365
+#: ../dgit:5440
#, perl-format
msgid ""
"--quilt=%s specified, implying that HEAD is for use with a\n"
@@ -1335,16 +1381,16 @@ msgid ""
" .gitignores: but, such patches exist in debian/patches.\n"
msgstr ""
-#: ../dgit:5374
+#: ../dgit:5449
msgid "dgit view: creating patch to represent .gitignore changes"
msgstr ""
-#: ../dgit:5379
+#: ../dgit:5454
#, perl-format
msgid "%s already exists; but want to create it to record .gitignore changes"
msgstr ""
-#: ../dgit:5384
+#: ../dgit:5459
msgid ""
"Subject: Update .gitignore from Debian packaging branch\n"
"\n"
@@ -1353,63 +1399,63 @@ msgid ""
"updates to users of the official Debian archive view of the package.\n"
msgstr ""
-#: ../dgit:5406
+#: ../dgit:5481
msgid "Commit patch to update .gitignore\n"
msgstr ""
-#: ../dgit:5420
+#: ../dgit:5495
msgid "converted"
msgstr ""
-#: ../dgit:5421
+#: ../dgit:5496
#, perl-format
msgid "dgit view: created (%s)"
msgstr ""
-#: ../dgit:5486
+#: ../dgit:5561
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5504
+#: ../dgit:5579
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5513
+#: ../dgit:5588
msgid "root commit"
msgstr ""
-#: ../dgit:5519
+#: ../dgit:5594
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5531
+#: ../dgit:5606
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5550
+#: ../dgit:5625
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5557
+#: ../dgit:5632
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5569
+#: ../dgit:5644
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5572
+#: ../dgit:5647
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5584
+#: ../dgit:5659
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@ -1417,68 +1463,68 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:5591
+#: ../dgit:5666
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5625
+#: ../dgit:5700
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5626
+#: ../dgit:5701
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5627
+#: ../dgit:5702
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5628
+#: ../dgit:5703
msgid "is series file\n"
msgstr ""
-#: ../dgit:5629
+#: ../dgit:5704
msgid "too long\n"
msgstr ""
-#: ../dgit:5633
+#: ../dgit:5708
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5662
+#: ../dgit:5737
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5802
+#: ../dgit:5880
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5812
+#: ../dgit:5890
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5914
+#: ../dgit:5992
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:5945
+#: ../dgit:6023
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:5950
+#: ../dgit:6028
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:5961
+#: ../dgit:6039
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6052
+#: ../dgit:6130
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"
@@ -1486,58 +1532,58 @@ msgid ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6066
+#: ../dgit:6144
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6103
+#: ../dgit:6181
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6106
+#: ../dgit:6184
#, 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"
msgstr ""
-#: ../dgit:6112
+#: ../dgit:6190
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6116
+#: ../dgit:6194
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6123
+#: ../dgit:6201
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6126
+#: ../dgit:6204
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6129
+#: ../dgit:6207
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6132
+#: ../dgit:6210
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6136
+#: ../dgit:6214
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6145
+#: ../dgit:6223
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6183
+#: ../dgit:6261
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1546,98 +1592,102 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:6195
+#: ../dgit:6273
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6223
-#, perl-format
+#: ../dgit:6302
msgid ""
-"%s\n"
"If this is just missing .gitignore entries, use a different clean\n"
-"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\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:6237
+#: ../dgit:6314
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6240
+#: ../dgit:6317
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6261
+#: ../dgit:6320
+msgid ""
+"tree contains uncommited, untracked, unignored files\n"
+"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
+msgstr ""
+
+#: ../dgit:6338
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6275
+#: ../dgit:6352
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6288
+#: ../dgit:6365
#, perl-format
msgid "-p is not allowed with dgit %s"
msgstr ""
-#: ../dgit:6324
+#: ../dgit:6404
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6326
+#: ../dgit:6406
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6352
+#: ../dgit:6432
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6358
+#: ../dgit:6438
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6361
+#: ../dgit:6441
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6404
+#: ../dgit:6484
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6522
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6449
+#: ../dgit:6529
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6456
+#: ../dgit:6536
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6460
+#: ../dgit:6540
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6465
+#: ../dgit:6545
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6468
+#: ../dgit:6548
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6481
+#: ../dgit:6561
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@ -1645,136 +1695,136 @@ msgid ""
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6499
+#: ../dgit:6579
msgid "build successful\n"
msgstr ""
-#: ../dgit:6506
+#: ../dgit:6586
#, 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:6616
+#: ../dgit:6696
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6651
+#: ../dgit:6731
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6671
+#: ../dgit:6751
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6684
+#: ../dgit:6764
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6688
+#: ../dgit:6768
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6695
+#: ../dgit:6775
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6701
+#: ../dgit:6781
msgid "source changes file"
msgstr ""
-#: ../dgit:6703
+#: ../dgit:6783
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6723 ../dgit:6725
+#: ../dgit:6803 ../dgit:6805
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6738
+#: ../dgit:6818
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:6750
+#: ../dgit:6830
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6754
+#: ../dgit:6834
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:6784
+#: ../dgit:6864
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6806
+#: ../dgit:6886
msgid "source tree"
msgstr ""
-#: ../dgit:6808
+#: ../dgit:6888
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6821
+#: ../dgit:6901
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6825
+#: ../dgit:6905
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6829
+#: ../dgit:6909
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6846
+#: ../dgit:6926
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6851
+#: ../dgit:6931
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6853
+#: ../dgit:6933
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6864
+#: ../dgit:6944
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6867
+#: ../dgit:6947
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6878
+#: ../dgit:6958
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6889
+#: ../dgit:6969
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6898
+#: ../dgit:6978
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@ -1782,21 +1832,21 @@ msgid ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6905
+#: ../dgit:6985
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6907
+#: ../dgit:6987
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6912
+#: ../dgit:6992
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:6917
+#: ../dgit:6997
#, perl-format
msgid ""
"Branch %s already exists\n"
@@ -1804,139 +1854,139 @@ msgid ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:6929
+#: ../dgit:7009
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:6931
+#: ../dgit:7011
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:6939
+#: ../dgit:7019
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:6943
+#: ../dgit:7023
#, perl-format
msgid "import %s requires .../%s, but it does not exist"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7028
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:6950
+#: ../dgit:7030
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:6951
+#: ../dgit:7031
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:6962
+#: ../dgit:7042
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:6964
+#: ../dgit:7044
msgid "Import, merging."
msgstr ""
-#: ../dgit:6978
+#: ../dgit:7058
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:6987
+#: ../dgit:7067
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:6994
+#: ../dgit:7074
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7000
+#: ../dgit:7080
#, perl-format
msgid "exec curl: %s\n"
msgstr ""
-#: ../dgit:7014
+#: ../dgit:7094
msgid "need destination argument"
msgstr ""
-#: ../dgit:7019
+#: ../dgit:7099
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7027
+#: ../dgit:7107
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7038
+#: ../dgit:7118
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7044
+#: ../dgit:7124
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7051 ../dgit:7057
+#: ../dgit:7131 ../dgit:7137
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7063
+#: ../dgit:7143
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7110
+#: ../dgit:7190
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7149
+#: ../dgit:7229
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7153
+#: ../dgit:7233
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7238
+#: ../dgit:7324
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7258
+#: ../dgit:7344
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7314
+#: ../dgit:7399
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7329
+#: ../dgit:7414
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7333
+#: ../dgit:7418
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7339
+#: ../dgit:7424
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@ -1944,44 +1994,44 @@ msgid ""
"Giving up.\n"
msgstr ""
-#: ../dgit:7356
+#: ../dgit:7441
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7369
+#: ../dgit:7454
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7389
+#: ../dgit:7474
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7399
+#: ../dgit:7484
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7404
+#: ../dgit:7489
msgid "dgit: --include-dirty is not supported in split view quilt mode"
msgstr ""
-#: ../dgit:7415
+#: ../dgit:7500
#, perl-format
msgid "unknown clean-mode `%s'"
msgstr ""
-#: ../dgit:7436
+#: ../dgit:7521
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7437
+#: ../dgit:7522
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7456
+#: ../dgit:7541
#, perl-format
msgid "unknown operation %s"
msgstr ""
@@ -1994,7 +2044,7 @@ msgid ""
" git-debrebase [<options>] prepush [--prose=...]\n"
" git-debrebase [<options>] quick|conclude\n"
" git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n"
-" git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n"
+" git-debrebase [<options>] convert-from-* ...\n"
" ...\n"
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
@@ -2479,15 +2529,15 @@ msgstr ""
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2541
+#: ../git-debrebase:2542
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2546
+#: ../git-debrebase:2547
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2562
+#: ../git-debrebase:2563
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
@@ -2495,58 +2545,58 @@ msgid ""
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2570
+#: ../git-debrebase:2571
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2577
+#: ../git-debrebase:2578
#, 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:2579
+#: ../git-debrebase:2580
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2586
+#: ../git-debrebase:2587
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2604
+#: ../git-debrebase:2605
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2610
+#: ../git-debrebase:2611
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2613
+#: ../git-debrebase:2614
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2616
+#: ../git-debrebase:2617
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2618
+#: ../git-debrebase:2619
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2620
+#: ../git-debrebase:2621
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2627
+#: ../git-debrebase:2628
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
@@ -2554,12 +2604,12 @@ msgid ""
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2673
+#: ../git-debrebase:2674
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2702
+#: ../git-debrebase:2703
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
@@ -2567,16 +2617,16 @@ msgid ""
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2723
+#: ../git-debrebase:2724
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2731
+#: ../git-debrebase:2732
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2745
+#: ../git-debrebase:2746
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
@@ -2584,84 +2634,84 @@ msgid ""
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2749
+#: ../git-debrebase:2750
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2761
+#: ../git-debrebase:2762
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2768
+#: ../git-debrebase:2769
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2774
+#: ../git-debrebase:2775
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2783
+#: ../git-debrebase:2784
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2789
+#: ../git-debrebase:2790
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2820
+#: ../git-debrebase:2821
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2829
+#: ../git-debrebase:2830
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2866
+#: ../git-debrebase:2867
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2875
+#: ../git-debrebase:2876
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2889
+#: ../git-debrebase:2890
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:2895
+#: ../git-debrebase:2896
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2902
+#: ../git-debrebase:2903
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2906
+#: ../git-debrebase:2907
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3008
+#: ../git-debrebase:3009
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3018
+#: ../git-debrebase:3019
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3048
+#: ../git-debrebase:3049
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""