diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-13 21:12:46 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-13 21:12:46 +0800 |
| commit | e875bc82f9e847899f16a90cb4a8c2dbd709e7c4 (patch) | |
| tree | 67e505ba52e0156e7387e3f15d3bd2065464a01a | |
| parent | 9ed8a0b8250cbf0924ba5584f13a67305866edc0 (diff) | |
i18n-commit - autogenerated
| -rw-r--r-- | po/en_US.po | 951 | ||||
| -rw-r--r-- | po/messages.pot | 974 | ||||
| -rw-r--r-- | po/nl.po | 1001 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 543 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 12 |
5 files changed, 2292 insertions, 1189 deletions
diff --git a/po/en_US.po b/po/en_US.po index b140820..bcd7918 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-11 21:39+0000\n" +"POT-Creation-Date: 2024-04-13 03:07+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" @@ -313,98 +313,98 @@ msgstr "" msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1905 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1951 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1962 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:2008 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:2017 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:2021 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:2027 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2070 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2082 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2095 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2111 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2116 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2124 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2131 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2159 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2167 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2170 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2192 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2215 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,129 +419,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2258 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2260 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2262 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2267 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2305 +#: ../dgit:2312 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "" -#: ../dgit:2309 +#: ../dgit:2316 #, perl-format msgid " %s: in %s (%s)\n" msgstr "" -#: ../dgit:2314 +#: ../dgit:2321 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "" -#: ../dgit:2331 +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2335 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2337 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2340 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2349 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2353 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2356 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2362 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2377 +#: ../dgit:2384 msgid "package changelog" msgstr "" -#: ../dgit:2482 +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2545 +#: ../dgit:2552 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2550 +#: ../dgit:2557 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" "%s\n" msgstr "" -#: ../dgit:2621 ../dgit:2626 +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2643 ../dgit:2650 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2676 ../dgit:6514 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "" -#: ../dgit:2756 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2809 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2827 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -550,16 +550,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2847 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2851 +#: ../dgit:2858 msgid "Import of source package" msgstr "" -#: ../dgit:2871 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -568,44 +568,44 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2913 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2917 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2921 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2937 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:3032 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:3047 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:3091 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:3106 +#: ../dgit:3113 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -613,7 +613,7 @@ msgid "" "or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:3111 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -623,24 +623,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3258 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3263 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3268 +#: ../dgit:3275 #, 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:3278 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -649,54 +649,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3298 +#: ../dgit:3305 msgid "rewrite map" msgstr "" -#: ../dgit:3305 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3309 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3311 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3318 +#: ../dgit:3325 msgid "additional commits" msgstr "" -#: ../dgit:3321 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3353 msgid "last upload to archive" msgstr "" -#: ../dgit:3350 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "" -#: ../dgit:3433 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3440 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3445 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3473 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -706,15 +706,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3486 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3489 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3510 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -722,7 +722,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3519 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -732,7 +732,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3604 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -740,19 +740,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3617 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3635 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3637 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3648 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -762,30 +762,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3663 +#: ../dgit:3670 msgid "fetched source tree" msgstr "" -#: ../dgit:3699 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3764 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3778 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3793 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3820 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -793,30 +793,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3842 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3850 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3889 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3921 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3923 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3962 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -824,7 +824,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3976 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -833,232 +833,584 @@ msgid "" "\n" msgstr "" -#: ../dgit:3991 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:4009 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:4027 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:4042 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:4054 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "" -#: ../dgit:4057 +#: ../dgit:4064 msgid "starting new git history" msgstr "" -#: ../dgit:4082 +#: ../dgit:4089 #, 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:4087 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:4099 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:4101 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:4109 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:4120 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4139 +#: ../dgit:4146 #, 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:4156 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4159 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4163 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4201 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4206 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4216 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4222 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4248 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4251 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4259 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4268 +#: ../dgit:4275 msgid "version currently in archive" msgstr "" -#: ../dgit:4277 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4286 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4297 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4300 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4305 +#: ../dgit:4312 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4319 +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4375 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4384 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "" -#: ../dgit:4386 +#: ../dgit:4393 msgid "dgit view tag" msgstr "" -#: ../dgit:4387 +#: ../dgit:4394 msgid "current archive contents" msgstr "" -#: ../dgit:4400 +#: ../dgit:4407 msgid "" "| Not fast forward; maybe --trust-changelog is needed ? Please see " "dgit(1).\n" msgstr "" -#: ../dgit:4410 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4411 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4415 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4428 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4436 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4448 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4470 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4524 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5768 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +msgid "commit" +msgstr "" + +#: ../dgit:4682 +#, perl-format +msgid "object within commit %s" +msgstr "" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +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:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, 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:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, perl-format +msgid "Tag %s already exists.\n" +msgstr "" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, 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:4893 +#, 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:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +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:5057 +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:5073 +#, perl-format +msgid "[new .dsc left in %s.tmp]" +msgstr "" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +msgid "incorrect arguments to dgit clone" +msgstr "" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../dgit:5131 +#, perl-format +msgid "remove %s: %s\n" +msgstr "" + +#: ../dgit:5135 +#, perl-format +msgid "check whether to remove %s: %s\n" +msgstr "" + +#: ../dgit:5173 +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "" + +#: ../dgit:5191 +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, perl-format +msgid "vcs git unchanged: %s\n" +msgstr "" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, perl-format +msgid "fetching (%s)\n" +msgstr "" + +#: ../dgit:5289 +#, perl-format +msgid "incorrect arguments to dgit %s" +msgstr "" + +#: ../dgit:5300 +#, perl-format +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, perl-format +msgid "create %s: %s" +msgstr "" + +#: ../dgit:5503 +#, perl-format +msgid "build host child failed: %s" +msgstr "" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, perl-format +msgid "buildinfo mismatch in field %s" +msgstr "" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +msgid "build-host-supplied changes file is not source-only" +msgstr "" + +#: ../dgit:5648 +msgid "remote changes file" +msgstr "" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:5773 +#: ../dgit:5780 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:5811 +#: ../dgit:5818 #, perl-format msgid "" "\n" @@ -1066,36 +1418,36 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5818 +#: ../dgit:5825 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5824 +#: ../dgit:5831 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5831 +#: ../dgit:5838 #, 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:5845 +#: ../dgit:5852 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:5853 +#: ../dgit:5860 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5864 +#: ../dgit:5871 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1103,16 +1455,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5872 +#: ../dgit:5879 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5877 +#: ../dgit:5884 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5883 +#: ../dgit:5890 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1121,54 +1473,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5905 +#: ../dgit:5913 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5975 +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5993 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6002 +#: ../dgit:6010 msgid "root commit" msgstr "" -#: ../dgit:6008 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6020 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6039 +#: ../dgit:6047 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6046 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6058 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6061 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6075 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1176,115 +1528,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6082 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6116 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6117 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6118 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6119 +#: ../dgit:6127 msgid "is series file\n" msgstr "" -#: ../dgit:6120 +#: ../dgit:6128 msgid "too long\n" msgstr "" -#: ../dgit:6124 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6153 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6228 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6253 +#: ../dgit:6261 msgid "converted" msgstr "" -#: ../dgit:6254 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6308 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6318 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6354 +#: ../dgit:6362 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6448 +#: ../dgit:6456 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6457 +#: ../dgit:6465 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6460 +#: ../dgit:6468 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6470 +#: ../dgit:6478 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6480 +#: ../dgit:6488 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6538 +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6570 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6575 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6610 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6703 +#: ../dgit:6711 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" @@ -1292,74 +1644,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6717 +#: ../dgit:6725 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6751 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6764 +#: ../dgit:6772 msgid "tarball" msgstr "" -#: ../dgit:6782 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6798 +#: ../dgit:6806 msgid "tarballs" msgstr "" -#: ../dgit:6812 +#: ../dgit:6820 msgid "upstream" msgstr "" -#: ../dgit:6836 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6846 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6856 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6860 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6863 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6866 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6869 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6873 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6884 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6923 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1368,96 +1720,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:6935 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6964 +#: ../dgit:6972 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:6976 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6979 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6982 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" "To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:6996 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7013 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7027 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7046 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7056 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7064 +#: ../dgit:7072 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" msgstr "" -#: ../dgit:7069 +#: ../dgit:7077 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" "This can cause .gitignore files to be improperly omitted. See #908747.\n" msgstr "" -#: ../dgit:7080 +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7084 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7119 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7121 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7139 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7146 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1465,54 +1817,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7172 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7178 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7181 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:7224 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7262 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7269 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7276 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7280 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7288 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7301 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1520,136 +1872,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7319 +#: ../dgit:7327 msgid "build successful\n" msgstr "" -#: ../dgit:7327 +#: ../dgit:7335 #, 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:7438 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7483 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7509 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7522 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7526 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7533 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7539 +#: ../dgit:7547 msgid "source changes file" msgstr "" -#: ../dgit:7541 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7561 ../dgit:7563 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7577 +#: ../dgit:7585 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:7590 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7594 +#: ../dgit:7602 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:7624 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7645 +#: ../dgit:7653 msgid "source tree" msgstr "" -#: ../dgit:7647 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7660 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7664 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7668 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7690 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7692 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7703 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7706 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7717 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7728 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7737 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1657,21 +2009,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7744 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7746 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7751 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7756 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1679,129 +2031,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7776 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7778 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7786 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7805 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7809 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7810 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7821 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7823 +#: ../dgit:7831 msgid "Import, merging." msgstr "" -#: ../dgit:7837 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7846 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7853 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7871 +#: ../dgit:7879 msgid "need destination argument" msgstr "" -#: ../dgit:7876 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7884 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7895 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7901 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7908 ../dgit:7914 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7920 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7967 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8010 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8113 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8131 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8186 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8201 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8205 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8211 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1809,35 +2161,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8228 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:8241 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:8261 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8273 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8301 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8302 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8322 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2092,11 +2444,6 @@ msgstr "" msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1815 -#, perl-format -msgid "%s already exists" -msgstr "" - #: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 71178c1..c8413c6 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,32 +6,9 @@ #, fuzzy msgid "" msgstr "" -"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-11 21:39+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" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n" -"Project-Id-Version: dgit ongoing\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-11 21:39+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" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n" -"Project-Id-Version: dgit ongoing\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-11 20:30+0000\n" +"POT-Creation-Date: 2024-04-13 03:07+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" @@ -336,98 +313,98 @@ msgstr "" msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1905 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1951 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1962 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:2008 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:2017 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:2021 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:2027 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2070 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2082 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2095 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2111 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2116 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2124 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2131 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2159 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2167 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2170 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2192 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2215 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -442,129 +419,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2258 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2260 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2262 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2267 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2305 +#: ../dgit:2312 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "" -#: ../dgit:2309 +#: ../dgit:2316 #, perl-format msgid " %s: in %s (%s)\n" msgstr "" -#: ../dgit:2314 +#: ../dgit:2321 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "" -#: ../dgit:2331 +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2335 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2337 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2340 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2349 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2353 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2356 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2362 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2377 +#: ../dgit:2384 msgid "package changelog" msgstr "" -#: ../dgit:2482 +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2545 +#: ../dgit:2552 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2550 +#: ../dgit:2557 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" "%s\n" msgstr "" -#: ../dgit:2621 ../dgit:2626 +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2643 ../dgit:2650 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2676 ../dgit:6514 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "" -#: ../dgit:2756 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2809 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2827 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -573,16 +550,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2847 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2851 +#: ../dgit:2858 msgid "Import of source package" msgstr "" -#: ../dgit:2871 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -591,44 +568,44 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2913 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2917 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2921 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2937 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:3032 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:3047 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:3091 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:3106 +#: ../dgit:3113 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -636,7 +613,7 @@ msgid "" "or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:3111 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -646,24 +623,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3258 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3263 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3268 +#: ../dgit:3275 #, 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:3278 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -672,54 +649,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3298 +#: ../dgit:3305 msgid "rewrite map" msgstr "" -#: ../dgit:3305 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3309 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3311 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3318 +#: ../dgit:3325 msgid "additional commits" msgstr "" -#: ../dgit:3321 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3353 msgid "last upload to archive" msgstr "" -#: ../dgit:3350 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "" -#: ../dgit:3433 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3440 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3445 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3473 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -729,15 +706,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3486 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3489 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3510 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -745,7 +722,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3519 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -755,7 +732,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3604 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -763,19 +740,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3617 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3635 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3637 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3648 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -785,30 +762,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3663 +#: ../dgit:3670 msgid "fetched source tree" msgstr "" -#: ../dgit:3699 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3764 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3778 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3793 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3820 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -816,30 +793,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3842 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3850 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3889 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3921 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3923 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3962 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -847,7 +824,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3976 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -856,232 +833,584 @@ msgid "" "\n" msgstr "" -#: ../dgit:3991 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:4009 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:4027 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:4042 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:4054 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "" -#: ../dgit:4057 +#: ../dgit:4064 msgid "starting new git history" msgstr "" -#: ../dgit:4082 +#: ../dgit:4089 #, 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:4087 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:4099 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:4101 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:4109 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:4120 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4139 +#: ../dgit:4146 #, 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:4156 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4159 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4163 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4201 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4206 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4216 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4222 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4248 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4251 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4259 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4268 +#: ../dgit:4275 msgid "version currently in archive" msgstr "" -#: ../dgit:4277 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4286 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4297 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4300 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4305 +#: ../dgit:4312 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4319 +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4375 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4384 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "" -#: ../dgit:4386 +#: ../dgit:4393 msgid "dgit view tag" msgstr "" -#: ../dgit:4387 +#: ../dgit:4394 msgid "current archive contents" msgstr "" -#: ../dgit:4400 +#: ../dgit:4407 msgid "" "| Not fast forward; maybe --trust-changelog is needed ? Please see " "dgit(1).\n" msgstr "" -#: ../dgit:4410 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4411 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4415 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4428 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4436 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4448 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4470 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4524 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5768 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +msgid "commit" +msgstr "" + +#: ../dgit:4682 +#, perl-format +msgid "object within commit %s" +msgstr "" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +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:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, 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:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, perl-format +msgid "Tag %s already exists.\n" +msgstr "" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, 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:4893 +#, 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:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +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:5057 +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:5073 +#, perl-format +msgid "[new .dsc left in %s.tmp]" +msgstr "" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +msgid "incorrect arguments to dgit clone" +msgstr "" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../dgit:5131 +#, perl-format +msgid "remove %s: %s\n" +msgstr "" + +#: ../dgit:5135 +#, perl-format +msgid "check whether to remove %s: %s\n" +msgstr "" + +#: ../dgit:5173 +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "" + +#: ../dgit:5191 +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, perl-format +msgid "vcs git unchanged: %s\n" +msgstr "" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, perl-format +msgid "fetching (%s)\n" +msgstr "" + +#: ../dgit:5289 +#, perl-format +msgid "incorrect arguments to dgit %s" +msgstr "" + +#: ../dgit:5300 +#, perl-format +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, perl-format +msgid "create %s: %s" +msgstr "" + +#: ../dgit:5503 +#, perl-format +msgid "build host child failed: %s" +msgstr "" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, perl-format +msgid "buildinfo mismatch in field %s" +msgstr "" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +msgid "build-host-supplied changes file is not source-only" +msgstr "" + +#: ../dgit:5648 +msgid "remote changes file" +msgstr "" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:5773 +#: ../dgit:5780 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:5811 +#: ../dgit:5818 #, perl-format msgid "" "\n" @@ -1089,36 +1418,36 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5818 +#: ../dgit:5825 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5824 +#: ../dgit:5831 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5831 +#: ../dgit:5838 #, 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:5845 +#: ../dgit:5852 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:5853 +#: ../dgit:5860 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5864 +#: ../dgit:5871 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1126,16 +1455,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5872 +#: ../dgit:5879 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5877 +#: ../dgit:5884 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5883 +#: ../dgit:5890 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1144,54 +1473,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5905 +#: ../dgit:5913 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5975 +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5993 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6002 +#: ../dgit:6010 msgid "root commit" msgstr "" -#: ../dgit:6008 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6020 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6039 +#: ../dgit:6047 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6046 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6058 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6061 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6075 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1199,115 +1528,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6082 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6116 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6117 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6118 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6119 +#: ../dgit:6127 msgid "is series file\n" msgstr "" -#: ../dgit:6120 +#: ../dgit:6128 msgid "too long\n" msgstr "" -#: ../dgit:6124 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6153 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6228 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6253 +#: ../dgit:6261 msgid "converted" msgstr "" -#: ../dgit:6254 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6308 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6318 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6354 +#: ../dgit:6362 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6448 +#: ../dgit:6456 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6457 +#: ../dgit:6465 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6460 +#: ../dgit:6468 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6470 +#: ../dgit:6478 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6480 +#: ../dgit:6488 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6538 +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6570 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6575 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6610 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6703 +#: ../dgit:6711 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" @@ -1315,74 +1644,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6717 +#: ../dgit:6725 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6751 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6764 +#: ../dgit:6772 msgid "tarball" msgstr "" -#: ../dgit:6782 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6798 +#: ../dgit:6806 msgid "tarballs" msgstr "" -#: ../dgit:6812 +#: ../dgit:6820 msgid "upstream" msgstr "" -#: ../dgit:6836 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6846 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6856 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6860 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6863 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6866 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6869 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6873 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6884 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6923 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1391,96 +1720,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:6935 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6964 +#: ../dgit:6972 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:6976 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6979 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6982 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" "To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:6996 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7013 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7027 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7046 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7056 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7064 +#: ../dgit:7072 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" msgstr "" -#: ../dgit:7069 +#: ../dgit:7077 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" "This can cause .gitignore files to be improperly omitted. See #908747.\n" msgstr "" -#: ../dgit:7080 +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7084 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7119 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7121 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7139 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7146 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1488,54 +1817,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7172 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7178 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7181 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:7224 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7262 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7269 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7276 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7280 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7288 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7301 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1543,136 +1872,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7319 +#: ../dgit:7327 msgid "build successful\n" msgstr "" -#: ../dgit:7327 +#: ../dgit:7335 #, 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:7438 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7483 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7509 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7522 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7526 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7533 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7539 +#: ../dgit:7547 msgid "source changes file" msgstr "" -#: ../dgit:7541 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7561 ../dgit:7563 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7577 +#: ../dgit:7585 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:7590 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7594 +#: ../dgit:7602 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:7624 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7645 +#: ../dgit:7653 msgid "source tree" msgstr "" -#: ../dgit:7647 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7660 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7664 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7668 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7690 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7692 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7703 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7706 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7717 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7728 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7737 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1680,21 +2009,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7744 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7746 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7751 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7756 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1702,129 +2031,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7776 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7778 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7786 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7805 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7809 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7810 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7821 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7823 +#: ../dgit:7831 msgid "Import, merging." msgstr "" -#: ../dgit:7837 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7846 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7853 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7871 +#: ../dgit:7879 msgid "need destination argument" msgstr "" -#: ../dgit:7876 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7884 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7895 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7901 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7908 ../dgit:7914 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7920 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7967 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8010 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8113 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8131 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8186 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8201 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8205 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8211 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1832,35 +2161,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8228 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:8241 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:8261 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8273 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8301 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8302 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8322 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2115,11 +2444,6 @@ msgstr "" msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1815 -#, perl-format -msgid "%s already exists" -msgstr "" - #: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_10.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-11 21:39+0000\n" +"POT-Creation-Date: 2024-04-13 03:07+0000\n" "PO-Revision-Date: 2023-01-17 17:24+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -364,94 +364,94 @@ msgstr "onbekende git-check `%s'" msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1905 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1951 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1962 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:2008 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:2017 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:2021 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:2027 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2070 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2082 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2095 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2111 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2116 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2124 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2131 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2159 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2167 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2170 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2192 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -460,7 +460,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2215 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -487,7 +487,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2227 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -495,38 +495,38 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2258 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2260 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2262 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2267 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2305 +#: ../dgit:2312 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "%s: meerdere weergaven van soortgelijke oorsprong %s:\n" -#: ../dgit:2309 +#: ../dgit:2316 #, perl-format msgid " %s: in %s (%s)\n" msgstr " %s: in %s (%s)\n" -#: ../dgit:2314 +#: ../dgit:2321 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "Dubbele/inconsistente orig-tar-archieven. Verwijder de ongewenste." -#: ../dgit:2331 +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -534,87 +534,87 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, aan het " "overbrengen:\n" -#: ../dgit:2335 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2337 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2340 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2349 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2353 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2356 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2362 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2377 +#: ../dgit:2384 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2482 +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2545 +#: ../dgit:2552 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2550 +#: ../dgit:2557 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" "%s\n" msgstr "" -#: ../dgit:2621 ../dgit:2626 +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" msgstr "benaderen van %s: %s" -#: ../dgit:2643 ../dgit:2650 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" msgstr "opslaan van %s: %s" -#: ../dgit:2676 ../dgit:6514 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2756 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2809 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2827 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -627,16 +627,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2847 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2851 +#: ../dgit:2858 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2871 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -649,12 +649,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2913 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2917 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -663,12 +663,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2921 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2937 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -676,24 +676,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:3032 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:3047 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" "waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt " "genegeerd.\n" -#: ../dgit:3091 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" "waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n" -#: ../dgit:3106 +#: ../dgit:3113 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -704,7 +704,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run. (Gewenst: %s.)\n" -#: ../dgit:3111 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -720,19 +720,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:3258 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" "ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet " "gehaald" -#: ../dgit:3263 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3268 +#: ../dgit:3275 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -741,7 +741,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3278 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -754,30 +754,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3298 +#: ../dgit:3305 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3305 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" "het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat " "een relevant element!" -#: ../dgit:3309 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3311 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" "de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden" -#: ../dgit:3318 +#: ../dgit:3325 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3321 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -786,27 +786,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3346 +#: ../dgit:3353 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3350 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3433 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3440 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3445 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3473 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -822,15 +822,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3486 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3489 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3510 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -842,7 +842,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3519 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -857,7 +857,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3604 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -868,19 +868,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3617 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3635 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3637 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3648 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -896,15 +896,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3663 +#: ../dgit:3670 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3699 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3764 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -912,16 +912,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3778 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n" -#: ../dgit:3793 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3820 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -932,32 +932,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3842 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3850 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3889 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3921 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3923 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" "het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt " "voorop!" -#: ../dgit:3962 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -968,7 +968,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3976 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -982,34 +982,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3991 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:4009 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:4027 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:4042 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:4054 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:4057 +#: ../dgit:4064 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:4082 +#: ../dgit:4089 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -1019,33 +1019,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:4087 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:4099 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:4101 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:4109 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:4120 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:4139 +#: ../dgit:4146 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1054,15 +1054,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:4156 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:4159 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:4163 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1070,7 +1070,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4201 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1078,60 +1078,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4206 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4216 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4222 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4248 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4251 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4259 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" "%s (%s) .. %s (%s) is niet fast forward (geen lineaire " "veranderingsgeschiedenis)\n" -#: ../dgit:4268 +#: ../dgit:4275 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4277 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4286 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4297 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4300 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" @@ -1140,7 +1140,7 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4305 +#: ../dgit:4312 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" @@ -1149,28 +1149,28 @@ msgstr "" "d/changelog-item voor %s is niet afgerond!\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4319 +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4375 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." msgstr "Controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4384 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4386 +#: ../dgit:4393 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4387 +#: ../dgit:4394 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4400 +#: ../dgit:4407 #, fuzzy #| msgid "" #| "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" @@ -1181,59 +1181,461 @@ msgstr "" "| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite " "nodig? Raadpleeg dgit(1).\n" -#: ../dgit:4410 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4411 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4415 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4428 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4436 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4448 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4470 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "%s is voor %s %s maar debian/changelog is voor %s %s" -#: ../dgit:4524 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog" -#: ../dgit:5768 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +#, fuzzy +#| msgid "root commit" +msgid "commit" +msgstr "beginvastlegging (root commit)" + +#: ../dgit:4682 +#, fuzzy, perl-format +#| msgid "origin commit" +msgid "object within commit %s" +msgstr "externe vastlegging (origin commit)" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while checking state of the archive.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, 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:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, fuzzy, perl-format +#| msgid "%s already exists" +msgid "Tag %s already exists.\n" +msgstr "%s bestaat reeds" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, 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:4893 +#, 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:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +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:5057 +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:5073 +#, fuzzy, perl-format +#| msgid "[new .changes left in %s]" +msgid "[new .dsc left in %s.tmp]" +msgstr "[nieuwe .changes achtergelaten in %s]" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +#, fuzzy +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit clone" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "%s bestaat reeds" + +#: ../dgit:5131 +#, fuzzy, perl-format +#| msgid "remove %s: %s" +msgid "remove %s: %s\n" +msgstr "verwijder %s: %s" + +#: ../dgit:5135 +#, fuzzy, perl-format +#| msgid "chdir toplevel %s: %s\n" +msgid "check whether to remove %s: %s\n" +msgstr "chdir naar hoogste niveau %s: %s\n" + +#: ../dgit:5173 +#, fuzzy +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5191 +#, fuzzy +#| msgid "" +#| "dgit: --include-dirty is not supported with split view (including with " +#| "view-splitting quilt modes)" +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" +"dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " +"inbegrip van quilt-modi welke de weergave splitsen)" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, fuzzy, perl-format +#| msgid "exec git clone: %s\n" +msgid "vcs git unchanged: %s\n" +msgstr "exec git clone: %s\n" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, fuzzy, perl-format +#| msgid "fetching %s..." +msgid "fetching (%s)\n" +msgstr "ophalen van %s..." + +#: ../dgit:5289 +#, fuzzy, perl-format +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit %s" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5300 +#, fuzzy, perl-format +#| msgid "-p specified %s but changelog specified %s" +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, fuzzy, perl-format +#| msgid "create `%s': %s" +msgid "create %s: %s" +msgstr "creëren van `%s': %s" + +#: ../dgit:5503 +#, fuzzy, perl-format +#| msgid "build host child %s" +msgid "build host child failed: %s" +msgstr "bouwcomputer-dochter %s" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, fuzzy, perl-format +#| msgid "build host child %s" +msgid "buildinfo mismatch in field %s" +msgstr "bouwcomputer-dochter %s" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +#, fuzzy +#| msgid "user-specified changes file is not source-only" +msgid "build-host-supplied changes file is not source-only" +msgstr "" +"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" + +#: ../dgit:5648 +#, fuzzy +#| msgid "source changes file" +msgid "remote changes file" +msgstr "broncode-changes-bestand" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:5773 +#: ../dgit:5780 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" "HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " "kunnen worden\n" -#: ../dgit:5811 +#: ../dgit:5818 #, perl-format msgid "" "\n" @@ -1244,7 +1646,7 @@ msgstr "" "Voor een volledig diff met de problemen, typ::\n" " %s\n" -#: ../dgit:5818 +#: ../dgit:5825 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1253,7 +1655,7 @@ msgstr "" "--quilt=%s opgegeven, wat een patches-unapplied git boom impliceert\n" " maar de git boom verschilt van orig in bovenstroomse bestanden." -#: ../dgit:5824 +#: ../dgit:5831 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1261,7 +1663,7 @@ msgstr "" "\n" " ... debian/patches ontbreekt; is dit misschien een patchwachtrijtak?" -#: ../dgit:5831 +#: ../dgit:5838 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1271,16 +1673,16 @@ msgstr "" " maar de git-boom verschilt van wat het toepassen van debian/patches op " "bovenstroom oplevert\n" -#: ../dgit:5845 +#: ../dgit:5852 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "debian/ met bovenstroomse bron van %s combineren\n" -#: ../dgit:5853 +#: ../dgit:5860 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "dgit view: een patches-applied versie creëren met gbp pq" -#: ../dgit:5864 +#: ../dgit:5871 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1291,17 +1693,17 @@ msgstr "" " gebruik met gereedschap dat geen patches maakt voor wijzigingen in\n" " bovenstroomse .gitignores: maar zulke patches bestaan in debian/patches.\n" -#: ../dgit:5872 +#: ../dgit:5879 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "dgit view: patch maken om .gitignore-wijzigingen weer te geven" -#: ../dgit:5877 +#: ../dgit:5884 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" "%s bestaat reeds; maar wil het maken om .gitignore-wijzigingen op te nemen" -#: ../dgit:5883 +#: ../dgit:5890 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1316,34 +1718,34 @@ msgstr "" "bijwerkingen te verstrekken aan gebruikers van de weergave van het pakket\n" "in het officiële Debian-archief.\n" -#: ../dgit:5905 +#: ../dgit:5913 msgid "Commit patch to update .gitignore\n" msgstr "Patch om .gitignore bij te werken vastleggen\n" -#: ../dgit:5975 +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5993 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:6002 +#: ../dgit:6010 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:6008 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:6020 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:6039 +#: ../dgit:6047 #, perl-format msgid "" "\n" @@ -1352,23 +1754,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:6046 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:6058 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" "lineair maken van de quilt-geschiedenis mislukte. Zoek naar `quilt fixup' in " "dgit(7).\n" -#: ../dgit:6061 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:6075 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1379,43 +1781,43 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:6082 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:6116 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:6117 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:6118 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:6119 +#: ../dgit:6127 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:6120 +#: ../dgit:6128 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:6124 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" "quiltifying commit (quiltificerende vastlegging) %s: Gbp-Pq %s wordt " "genegeerd/weggelaten: %s" -#: ../dgit:6153 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:6228 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" @@ -1423,30 +1825,30 @@ msgid "" msgstr "" "quilt modus %s is zinloos (of wordt niet ondersteund) met single-debian-patch" -#: ../dgit:6253 +#: ../dgit:6261 msgid "converted" msgstr "omgezet" -#: ../dgit:6254 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:6308 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:6318 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6354 +#: ../dgit:6362 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "patch opnieuw genereren met git diff (--quilt=%s)" -#: ../dgit:6448 +#: ../dgit:6456 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" @@ -1454,47 +1856,47 @@ msgstr "" "opgelet: pakket gebruikt de functie include-binaries van dpkg-source - niet " "alle wijzigingen zijn zichtbaar in patches!\n" -#: ../dgit:6457 +#: ../dgit:6465 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "opgelet: slecht nclude-binaries-bestand %s wordt genegeerd: %s\n" -#: ../dgit:6460 +#: ../dgit:6468 #, perl-format msgid "forbidden path component '%s'" msgstr "niet toegelaten pad-component '%s'" -#: ../dgit:6470 +#: ../dgit:6478 #, perl-format msgid "path starts with '%s'" msgstr "pad begint met '%s'" -#: ../dgit:6480 +#: ../dgit:6488 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "pad naar '%s' geen gewoon bestand of map" -#: ../dgit:6538 +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" "dgit: gespleten brein (aparte dgit-weergave) is mogelijk nodig (--quilt=%s)." -#: ../dgit:6570 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6575 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6610 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6703 +#: ../dgit:6711 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" @@ -1508,37 +1910,37 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6717 +#: ../dgit:6725 msgid "Tree already contains .pc - will delete it." msgstr "Boom bevat reeds een .pc - zal dit verwijderen." -#: ../dgit:6751 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "baredebian quilt reparatie: kon geen origs vinden" -#: ../dgit:6764 +#: ../dgit:6772 msgid "tarball" msgstr "tar-archief" -#: ../dgit:6782 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr " Combineren van orig tar-archieven voor %s %s" -#: ../dgit:6798 +#: ../dgit:6806 msgid "tarballs" msgstr "tar-archieven" -#: ../dgit:6812 +#: ../dgit:6820 msgid "upstream" msgstr "bovenstroom" -#: ../dgit:6836 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "%s: van de basisbomen zijn orig=%.20s en o+d/p=%.20s" -#: ../dgit:6846 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1547,42 +1949,42 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: %9.00009s %s o+d/p %9.00009s %s o+d/p" -#: ../dgit:6856 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "Dit bevat enkel een map debian/; wellicht wilt u --quilt=bare debian." -#: ../dgit:6860 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6863 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6866 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" "Heeft u mogelijk een van de volgende opties nodig: --[quilt=]gbp --" "[quilt=]dpm --quilt=unapplied ?" -#: ../dgit:6869 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6873 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" "Is/zijn het/de orig-tararchie(f)(ven) misschien niet identiek aan de " "representatie ervan door git?" -#: ../dgit:6884 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6923 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1596,12 +1998,12 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6935 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" "dgit: Toepassen van patches terug ongedaan maken om de boom op te schonen." -#: ../dgit:6964 +#: ../dgit:6972 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" @@ -1613,18 +2015,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6976 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6979 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (NB dgit voerde geen rules clean " "uit)" -#: ../dgit:6982 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" @@ -1635,7 +2037,7 @@ msgstr "" "Om ze in de bouw op te nemen, is het gewoonlijk best om ze gewoon vast te " "leggen." -#: ../dgit:6996 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" @@ -1644,21 +2046,21 @@ msgstr "" "quilt modus %s (heeft meestal niet gevolgde bovenstroomse bestanden nodig)\n" "is in strijd met clean modus %s (welke deze zou verwijderen)\n" -#: ../dgit:7013 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:7027 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:7046 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "-p specificeerde pakket %s, maar het changelog-bestand vermeldt %s" -#: ../dgit:7056 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" @@ -1666,46 +2068,46 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " "inbegrip van quilt-modi welke de weergave splitsen)" -#: ../dgit:7064 +#: ../dgit:7072 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" msgstr "" -#: ../dgit:7069 +#: ../dgit:7077 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" "This can cause .gitignore files to be improperly omitted. See #908747.\n" msgstr "" -#: ../dgit:7080 +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "dgit: --quilt=%s, %s" -#: ../dgit:7084 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "dgit: --upstream-commitish is enkel zinvol met --quilt=baredebian" -#: ../dgit:7119 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:7121 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:7139 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" "waarschuwing: aan de commandoregel van dgit moet de optie %s van dgit " "opgegeven worden voor %s\n" -#: ../dgit:7146 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1716,56 +2118,56 @@ msgstr "" "worden aan dgit voor het sub-commando %s, zodat het door dgit gezien wordt " "en niet enkel meegegeven wordt aan %s\n" -#: ../dgit:7172 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" "mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet " "opgegeven werd)" -#: ../dgit:7178 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:7181 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:7224 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:7262 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:7269 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:7276 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:7280 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:7288 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:7301 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1777,11 +2179,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:7319 +#: ../dgit:7327 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:7327 +#: ../dgit:7335 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1792,30 +2194,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:7438 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:7483 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7509 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7522 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7526 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7533 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -1823,21 +2225,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7539 +#: ../dgit:7547 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7541 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7561 ../dgit:7563 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7577 +#: ../dgit:7585 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" @@ -1846,7 +2248,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7590 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -1854,7 +2256,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7594 +#: ../dgit:7602 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -1863,65 +2265,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7624 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7645 +#: ../dgit:7653 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7647 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7660 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7664 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7668 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7690 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7692 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7703 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7706 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7717 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7728 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "dgit: import-dsc van .dsc met Dgit-veld, met behulp van git hash" -#: ../dgit:7737 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1932,21 +2334,21 @@ msgstr "" "Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n" "server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n" -#: ../dgit:7744 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:7746 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:7751 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7756 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1958,88 +2360,88 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7776 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7778 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7786 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7805 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!" -#: ../dgit:7809 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7810 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7821 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." msgstr "Importeren, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7823 +#: ../dgit:7831 msgid "Import, merging." msgstr "Importeren, samenvoegen." -#: ../dgit:7837 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7846 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7853 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7871 +#: ../dgit:7879 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7876 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7884 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url" -#: ../dgit:7895 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7901 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7908 ../dgit:7914 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7920 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7967 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2047,42 +2449,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:8010 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:8113 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:8131 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:8186 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:8201 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n" -#: ../dgit:8205 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:8211 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2093,37 +2495,37 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:8228 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:8241 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:8261 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:8273 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:8301 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:8302 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:8322 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -2410,11 +2812,6 @@ msgstr "analyse ondersteunt geen opties" msgid "too many arguments to analyse" msgstr "te veel argumenten om te analyseren" -#: ../git-debrebase:1815 -#, perl-format -msgid "%s already exists" -msgstr "%s bestaat reeds" - #: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "HEAD symref wijst niet naar refs/heads/" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index a6960a2..ff8b8e0 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-04-11 22:39+0100\n" +"POT-Creation-Date: 2024-04-13 21:12+0800\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" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1364 +#: ../dgit.1:185 ../dgit.1:1389 msgid "Print a usage summary." msgstr "" @@ -1349,11 +1349,46 @@ msgstr "" #. type: TP #: ../dgit.1:709 #, no-wrap +msgid "B<--collab-non-dgit>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:716 +msgid "" +"Make B<dgit push>, behave more suitably for collaborating (using shared git " +"history) with git-using co-developers who aren't using dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:722 +msgid "" +"With this option, dgit won't mind that the git history you're using isn't " +"necessarily fast forward from the dgit view; instead, it will rely on the " +"changelog to prevent accidentally overwriting changes." +msgstr "" + +#. type: Plain text +#: ../dgit.1:731 +msgid "" +"And, the synthetic commits needed to make the dgit git history fast forward " +"will appear only on the dgit git server, and local dgit suite branches, not " +"on your own main branch. So they won't end up in the maintainer-visible " +"history, when you push your own branch to make a merge request." +msgstr "" + +#. type: Plain text +#: ../dgit.1:734 +msgid "This is equivalent to B<--split-view=always --trust-changelog>." +msgstr "" + +#. type: TP +#: ../dgit.1:734 +#, no-wrap msgid "B<--trust-changelog> | B<--overwrite>=I<previous-version>" msgstr "" #. type: Plain text -#: ../dgit.1:720 +#: ../dgit.1:745 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1362,14 +1397,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:726 +#: ../dgit.1:751 msgid "" "It is safer to specify B<--trust-changelog>, than B<--overwrite=>I<previous-" "version>, and usually the latter is not needed." msgstr "" #. type: Plain text -#: ../dgit.1:733 +#: ../dgit.1:758 msgid "" "B<--trust-changelog> is useful if you are the maintainer, and you have " "incorporated NMU changes into your own git workflow in a way that doesn't " @@ -1379,14 +1414,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:739 +#: ../dgit.1:764 msgid "" "It is also usually necessary the first time a package is pushed with dgit " "push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:748 +#: ../dgit.1:773 msgid "" "With B<--trust-changelog> dgit will check that the version in the archive is " "mentioned in your debian/changelog. (This will avoid losing changes, unless " @@ -1395,7 +1430,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:754 +#: ../dgit.1:779 msgid "" "With B<--overwrite=>I<previous-version> that version ought to be the version " "currently in the archive, and it will be unconditionally overwritten, " @@ -1403,7 +1438,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:760 +#: ../dgit.1:785 msgid "" "These options will, if necessary, make a pseudo-merge (that is, something " "that looks like the result of git merge -s ours) to stitch the archive's " @@ -1412,7 +1447,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:767 +#: ../dgit.1:792 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1421,25 +1456,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:771 +#: ../dgit.1:796 msgid "" "B<--overwrite> without a version number is an obsolete way of specifying B<--" "trust-changelog>." msgstr "" #. type: TP -#: ../dgit.1:771 +#: ../dgit.1:796 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:774 +#: ../dgit.1:799 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:784 +#: ../dgit.1:809 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1449,27 +1484,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:789 +#: ../dgit.1:814 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:789 +#: ../dgit.1:814 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:795 +#: ../dgit.1:820 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:805 +#: ../dgit.1:830 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1478,7 +1513,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:813 +#: ../dgit.1:838 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1487,13 +1522,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:813 +#: ../dgit.1:838 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:823 +#: ../dgit.1:848 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1502,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:827 +#: ../dgit.1:852 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1510,25 +1545,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:856 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:835 +#: ../dgit.1:860 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:835 +#: ../dgit.1:860 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:849 +#: ../dgit.1:874 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1540,13 +1575,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:849 +#: ../dgit.1:874 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:855 +#: ../dgit.1:880 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1554,7 +1589,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:861 +#: ../dgit.1:886 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1563,7 +1598,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:872 +#: ../dgit.1:897 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1573,13 +1608,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:872 +#: ../dgit.1:897 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:881 +#: ../dgit.1:906 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1591,13 +1626,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:881 +#: ../dgit.1:906 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:886 +#: ../dgit.1:911 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1605,13 +1640,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:886 ../git-debpush.1.pod:114 +#: ../dgit.1:911 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:893 +#: ../dgit.1:918 msgid "" "With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " "each relevant commit. If such a stack cannot be generated, fail. This is " @@ -1619,20 +1654,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:898 +#: ../dgit.1:923 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:898 +#: ../dgit.1:923 #, no-wrap msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:933 msgid "" "With format `3.0 (quilt)', prefer a linear patch stack (as with --" "quilt=linear) but if that doesn't seem possible, try to generate a single " @@ -1641,13 +1676,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:908 ../git-debpush.1.pod:120 +#: ../dgit.1:933 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:914 +#: ../dgit.1:939 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone) and generate a single additional patch for all the changes made in " @@ -1655,7 +1690,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:920 +#: ../dgit.1:945 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1664,13 +1699,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:920 +#: ../dgit.1:945 #, no-wrap msgid "B<--quilt=single>" msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:952 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), delete all the existing patches, and then generate a single patch " @@ -1679,7 +1714,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:936 +#: ../dgit.1:961 msgid "" "Use this instead of the B<single-debian-patch> dpkg-source format option. " "That dpkg-source option cannot handle certain changes to the tree that dpkg-" @@ -1689,13 +1724,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:936 ../git-debpush.1.pod:131 +#: ../dgit.1:961 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:946 +#: ../dgit.1:971 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), and check that the patch metadata is up to date. If it isn't, fail; " @@ -1705,13 +1740,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:946 +#: ../dgit.1:971 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:953 +#: ../dgit.1:978 msgid "" "With format `3.0 (quilt)', assume that the tree is patches-applied (as " "obtained from dgit clone), and I<assume> that the patch metadata is up to " @@ -1720,27 +1755,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:953 +#: ../dgit.1:978 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:985 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:964 +#: ../dgit.1:989 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:972 +#: ../dgit.1:997 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1749,7 +1784,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:980 +#: ../dgit.1:1005 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1757,7 +1792,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:985 +#: ../dgit.1:1010 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1765,7 +1800,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:999 +#: ../dgit.1:1024 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1777,7 +1812,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1010 +#: ../dgit.1:1035 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1788,7 +1823,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1028 +#: ../dgit.1:1053 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1802,7 +1837,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1037 +#: ../dgit.1:1062 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1814,13 +1849,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1037 +#: ../dgit.1:1062 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1046 +#: ../dgit.1:1071 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1830,7 +1865,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1052 +#: ../dgit.1:1077 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1839,7 +1874,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1057 +#: ../dgit.1:1082 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1847,20 +1882,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1057 +#: ../dgit.1:1082 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:1062 +#: ../dgit.1:1087 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:1070 +#: ../dgit.1:1095 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1870,7 +1905,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1076 +#: ../dgit.1:1101 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1878,18 +1913,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1104 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1107 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1090 +#: ../dgit.1:1115 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1897,20 +1932,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1118 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1093 +#: ../dgit.1:1118 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1098 +#: ../dgit.1:1123 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1918,7 +1953,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1107 +#: ../dgit.1:1132 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1926,13 +1961,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1107 +#: ../dgit.1:1132 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1140 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1941,13 +1976,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1115 +#: ../dgit.1:1140 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1127 +#: ../dgit.1:1152 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1959,32 +1994,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1130 +#: ../dgit.1:1155 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1130 +#: ../dgit.1:1155 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1134 +#: ../dgit.1:1159 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1137 +#: ../dgit.1:1162 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1146 +#: ../dgit.1:1171 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1993,72 +2028,72 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1146 +#: ../dgit.1:1171 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1149 +#: ../dgit.1:1174 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1149 +#: ../dgit.1:1174 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1156 +#: ../dgit.1:1181 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1156 +#: ../dgit.1:1181 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1159 +#: ../dgit.1:1184 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1159 +#: ../dgit.1:1184 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1162 +#: ../dgit.1:1187 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1162 +#: ../dgit.1:1187 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1166 +#: ../dgit.1:1191 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1166 +#: ../dgit.1:1191 #, no-wrap msgid "B<--keep-playground>|B<--no--keep-playground>" msgstr "" #. type: Plain text -#: ../dgit.1:1175 +#: ../dgit.1:1200 msgid "" "Controls whether to retain the \"playground\" working directory B<.git/dgit/" "unpack> even on success, for examination and debugging. The default is B<--" @@ -2066,26 +2101,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1175 +#: ../dgit.1:1200 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1204 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1179 +#: ../dgit.1:1204 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1188 +#: ../dgit.1:1213 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -2095,7 +2130,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1194 +#: ../dgit.1:1219 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -2103,30 +2138,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1194 +#: ../dgit.1:1219 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1197 +#: ../dgit.1:1222 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1197 +#: ../dgit.1:1222 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1201 +#: ../dgit.1:1226 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1208 +#: ../dgit.1:1233 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -2134,18 +2169,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1210 +#: ../dgit.1:1235 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1210 +#: ../dgit.1:1235 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1232 +#: ../dgit.1:1257 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2155,7 +2190,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1265 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2164,7 +2199,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1245 +#: ../dgit.1:1270 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2172,7 +2207,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1249 +#: ../dgit.1:1274 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2180,39 +2215,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1251 +#: ../dgit.1:1276 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1259 +#: ../dgit.1:1284 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1259 +#: ../dgit.1:1284 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1265 +#: ../dgit.1:1290 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1270 +#: ../dgit.1:1295 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1277 +#: ../dgit.1:1302 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2220,13 +2255,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1277 +#: ../dgit.1:1302 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1300 +#: ../dgit.1:1325 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2236,14 +2271,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1308 +#: ../dgit.1:1333 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1315 +#: ../dgit.1:1340 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2252,7 +2287,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1326 +#: ../dgit.1:1351 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2262,7 +2297,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1334 +#: ../dgit.1:1359 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2270,7 +2305,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1351 +#: ../dgit.1:1376 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2282,13 +2317,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1351 +#: ../dgit.1:1376 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1361 +#: ../dgit.1:1386 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2299,19 +2334,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1361 +#: ../dgit.1:1386 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1364 +#: ../dgit.1:1389 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1373 +#: ../dgit.1:1398 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2321,13 +2356,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1373 +#: ../dgit.1:1398 #, no-wrap msgid "B<--dry-run> | B<-n>" msgstr "" #. type: Plain text -#: ../dgit.1:1379 +#: ../dgit.1:1404 msgid "" "Go through the motions, fetching all information needed, but do not actually " "update the output(s). For push, dgit does the required checks and leaves " @@ -2335,27 +2370,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1382 +#: ../dgit.1:1407 msgid "" "This is not a very good simulation. It can easily go wrong in ways that a " "for-real push wouldn't." msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1407 #, no-wrap msgid "B<--damp-run> | B<-L>" msgstr "" #. type: Plain text -#: ../dgit.1:1387 +#: ../dgit.1:1412 msgid "" "Go through many more of the motions: do everything that doesn't involve " "either signing things, or making changes on the public servers." msgstr "" #. type: Plain text -#: ../dgit.1:1392 +#: ../dgit.1:1417 msgid "" "Using this will make unsigned tags, and possibly other local changes, that " "will get in the way of a for-real push. So be prepared to burn the version " @@ -2363,13 +2398,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1392 +#: ../dgit.1:1417 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1400 +#: ../dgit.1:1425 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2378,13 +2413,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1400 +#: ../dgit.1:1425 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1407 +#: ../dgit.1:1432 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2392,13 +2427,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1432 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1414 +#: ../dgit.1:1439 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2407,26 +2442,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1414 +#: ../dgit.1:1439 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1419 +#: ../dgit.1:1444 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1419 +#: ../dgit.1:1444 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1425 +#: ../dgit.1:1450 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2434,13 +2469,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1425 +#: ../dgit.1:1450 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1432 +#: ../dgit.1:1457 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2448,65 +2483,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1432 +#: ../dgit.1:1457 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1462 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1462 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1466 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1466 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1445 +#: ../dgit.1:1470 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1445 +#: ../dgit.1:1470 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1451 +#: ../dgit.1:1476 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1451 +#: ../dgit.1:1476 #, no-wrap msgid "B<--force-push-tainted>" msgstr "" #. type: Plain text -#: ../dgit.1:1461 +#: ../dgit.1:1486 msgid "" "Go ahead and try to push even tainted git objects hat the server says it is " "going to reject, but without declaring any --deliberately. This option is " @@ -2516,13 +2551,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1461 +#: ../dgit.1:1486 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1467 +#: ../dgit.1:1492 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2530,13 +2565,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1467 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1492 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1473 +#: ../dgit.1:1498 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2544,31 +2579,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1475 +#: ../dgit.1:1500 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1475 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1481 +#: ../dgit.1:1506 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1481 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1506 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1486 +#: ../dgit.1:1511 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2576,73 +2611,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1489 +#: ../dgit.1:1514 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1514 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1492 +#: ../dgit.1:1517 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1496 +#: ../dgit.1:1521 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1496 +#: ../dgit.1:1521 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1499 +#: ../dgit.1:1524 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1524 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1504 +#: ../dgit.1:1529 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1504 +#: ../dgit.1:1529 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1508 +#: ../dgit.1:1533 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1508 +#: ../dgit.1:1533 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1514 +#: ../dgit.1:1539 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2650,45 +2685,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1514 +#: ../dgit.1:1539 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1518 +#: ../dgit.1:1543 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1518 +#: ../dgit.1:1543 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1520 +#: ../dgit.1:1545 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1524 +#: ../dgit.1:1549 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1524 +#: ../dgit.1:1549 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1531 +#: ../dgit.1:1556 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2697,52 +2732,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1531 +#: ../dgit.1:1556 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1535 +#: ../dgit.1:1560 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1535 +#: ../dgit.1:1560 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1537 +#: ../dgit.1:1562 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1540 +#: ../dgit.1:1565 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1540 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1565 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1543 +#: ../dgit.1:1568 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1543 +#: ../dgit.1:1568 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1548 +#: ../dgit.1:1573 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2750,26 +2785,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1548 +#: ../dgit.1:1573 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1577 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1552 +#: ../dgit.1:1577 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1557 +#: ../dgit.1:1582 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2777,13 +2812,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1557 +#: ../dgit.1:1582 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1563 +#: ../dgit.1:1588 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2791,24 +2826,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1563 +#: ../dgit.1:1588 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1569 +#: ../dgit.1:1594 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1569 +#: ../dgit.1:1594 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1581 +#: ../dgit.1:1606 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2818,13 +2853,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1581 +#: ../dgit.1:1606 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1586 +#: ../dgit.1:1611 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2833,215 +2868,215 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1586 +#: ../dgit.1:1611 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1589 +#: ../dgit.1:1614 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1589 +#: ../dgit.1:1614 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1592 +#: ../dgit.1:1617 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1592 +#: ../dgit.1:1617 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1598 +#: ../dgit.1:1623 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1598 +#: ../dgit.1:1623 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1600 +#: ../dgit.1:1625 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1602 +#: ../dgit.1:1627 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1604 +#: ../dgit.1:1629 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1606 +#: ../dgit.1:1631 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1608 +#: ../dgit.1:1633 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1610 +#: ../dgit.1:1635 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.policy-query-supported-ssh>I< >B<false>I<|>B<unknown>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1612 +#: ../dgit.1:1637 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1614 +#: ../dgit.1:1639 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1616 +#: ../dgit.1:1641 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1618 +#: ../dgit.1:1643 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1620 +#: ../dgit.1:1645 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1622 +#: ../dgit.1:1647 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1624 +#: ../dgit.1:1649 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1626 +#: ../dgit.1:1651 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1628 +#: ../dgit.1:1653 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1630 +#: ../dgit.1:1655 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1632 +#: ../dgit.1:1657 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1634 +#: ../dgit.1:1659 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1636 +#: ../dgit.1:1661 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1638 +#: ../dgit.1:1663 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1640 +#: ../dgit.1:1665 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1642 +#: ../dgit.1:1667 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1644 +#: ../dgit.1:1669 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1646 +#: ../dgit.1:1671 #, no-wrap msgid "B<dgit.default.push-subcmd>I< >B<source>I<|>B<built>I<|>B<warn,built>" msgstr "" #. type: Plain text -#: ../dgit.1:1650 +#: ../dgit.1:1675 msgid "Controls the behaviour of B<dgit push>." msgstr "" #. type: TP -#: ../dgit.1:1650 +#: ../dgit.1:1675 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1652 +#: ../dgit.1:1677 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1653 +#: ../dgit.1:1678 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1662 +#: ../dgit.1:1687 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -3051,26 +3086,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1662 +#: ../dgit.1:1687 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1666 +#: ../dgit.1:1691 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1666 +#: ../dgit.1:1691 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1671 +#: ../dgit.1:1696 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -3078,13 +3113,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1671 +#: ../dgit.1:1696 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1678 +#: ../dgit.1:1703 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -3092,7 +3127,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1684 +#: ../dgit.1:1709 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -3100,7 +3135,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1689 +#: ../dgit.1:1714 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -3109,7 +3144,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1694 +#: ../dgit.1:1719 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -3117,7 +3152,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1719 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 #: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 @@ -3129,13 +3164,13 @@ msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1703 +#: ../dgit.1:1728 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1704 +#: ../dgit.1:1729 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 6e1d42f..e0941c5 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2023-10-29 17:49+0000\n" +"POT-Creation-Date: 2024-04-13 21:12+0800\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" @@ -34,11 +34,11 @@ msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1719 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 #: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 #: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap @@ -118,9 +118,9 @@ msgstr "" #: ../git-debrebase.1.pod:32 msgid "" "This is the command line reference. There is also a detailed workflow " -"tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK REFERENCE" -"\" is based). For background, theory of operation, and definitions see " -"L<git-debrebase(5)>." +"tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK " +"REFERENCE\" is based). For background, theory of operation, and definitions " +"see L<git-debrebase(5)>." msgstr "" #. type: textblock |