diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-06 17:50:48 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-06 19:14:48 +0000 |
| commit | aa57a5799afda71dd5750b05bfaccd9ec74e5c08 (patch) | |
| tree | 4bf4c8a41e9212b83b4fadd44175d718561336bd /po | |
| parent | f4a1dfadf1ccc71aaab1a63fb4418c1ceba0710d (diff) | |
i18n-commit - autogenerated
Diffstat (limited to 'po')
| -rw-r--r-- | po/en_US.po | 736 | ||||
| -rw-r--r-- | po/messages.pot | 736 | ||||
| -rw-r--r-- | po/nl.po | 762 |
3 files changed, 1204 insertions, 1030 deletions
diff --git a/po/en_US.po b/po/en_US.po index df78b26..0e4ddfb 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: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -33,7 +33,7 @@ msgstr "" #: ../dgit:260 #, perl-format -msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "" #: ../dgit:483 @@ -440,49 +440,95 @@ msgstr "" msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, perl-format +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, perl-format +msgid "check orig file %s in ..: %s" +msgstr "" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, perl-format +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "" + +#: ../dgit:2249 +#, perl-format +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "" + +#: ../dgit:2252 +#, perl-format +msgid "failed to make %s a hardlink to %s: %s" +msgstr "" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -491,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -514,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2773 +#: ../dgit:2844 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2817 +#: ../dgit:2888 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2832 +#: ../dgit:2903 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -568,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:2988 +#: ../dgit:3059 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:2998 +#: ../dgit:3069 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -619,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "" -#: ../dgit:3035 +#: ../dgit:3106 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3041 +#: ../dgit:3112 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -676,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -692,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -702,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -710,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -732,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3507 +#: ../dgit:3579 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -763,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3652 +#: ../dgit:3724 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -794,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -803,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "" -#: ../dgit:3804 +#: ../dgit:3879 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3842 +#: ../dgit:3917 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3861 +#: ../dgit:3936 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:3975 +#: ../dgit:4050 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4053 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3986 +#: ../dgit:4061 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "" -#: ../dgit:4120 +#: ../dgit:4195 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4190 +#: ../dgit:4265 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4251 +#: ../dgit:4326 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4344 +#: ../dgit:4419 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4353 +#: ../dgit:4428 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4381 +#: ../dgit:4456 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1053,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1068,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4503 +#: ../dgit:4578 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1093,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4546 +#: ../dgit:4621 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4550 +#: ../dgit:4625 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4635 +#: ../dgit:4710 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4652 +#: ../dgit:4727 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1147,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4695 +#: ../dgit:4770 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4785 +#: ../dgit:4860 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4892 +#: ../dgit:4967 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1303,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5349 +#: ../dgit:5424 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1335,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5379 +#: ../dgit:5454 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1353,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5569 +#: ../dgit:5644 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1417,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5708 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5914 +#: ../dgit:5992 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6052 +#: ../dgit:6130 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1486,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6103 +#: ../dgit:6181 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6106 +#: ../dgit:6184 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgstr "" -#: ../dgit:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6116 +#: ../dgit:6194 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6129 +#: ../dgit:6207 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6136 +#: ../dgit:6214 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1546,98 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6273 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6223 -#, perl-format +#: ../dgit:6302 msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6240 +#: ../dgit:6317 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6352 +#: ../dgit:6432 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1645,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "" -#: ../dgit:6506 +#: ../dgit:6586 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6738 +#: ../dgit:6818 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6754 +#: ../dgit:6834 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6889 +#: ../dgit:6969 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1782,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -1804,139 +1854,139 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:6939 +#: ../dgit:7019 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:6943 +#: ../dgit:7023 #, perl-format msgid "import %s requires .../%s, but it does not exist" msgstr "" -#: ../dgit:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "" -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7027 +#: ../dgit:7107 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7329 +#: ../dgit:7414 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1944,44 +1994,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7404 +#: ../dgit:7489 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1994,7 +2044,7 @@ msgid "" " git-debrebase [<options>] prepush [--prose=...]\n" " git-debrebase [<options>] quick|conclude\n" " git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n" -" git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n" +" git-debrebase [<options>] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2479,15 +2529,15 @@ msgstr "" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2495,58 +2545,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2554,12 +2604,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2567,16 +2617,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2584,84 +2634,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 9506b59..840de39 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,7 +33,7 @@ msgstr "" #: ../dgit:260 #, perl-format -msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "" #: ../dgit:483 @@ -440,49 +440,95 @@ msgstr "" msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, perl-format +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, perl-format +msgid "check orig file %s in ..: %s" +msgstr "" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, perl-format +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "" + +#: ../dgit:2249 +#, perl-format +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "" + +#: ../dgit:2252 +#, perl-format +msgid "failed to make %s a hardlink to %s: %s" +msgstr "" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -491,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -514,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2773 +#: ../dgit:2844 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2817 +#: ../dgit:2888 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2832 +#: ../dgit:2903 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -568,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:2988 +#: ../dgit:3059 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:2998 +#: ../dgit:3069 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -619,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "" -#: ../dgit:3035 +#: ../dgit:3106 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3041 +#: ../dgit:3112 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -676,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -692,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -702,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -710,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -732,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3507 +#: ../dgit:3579 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -763,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3652 +#: ../dgit:3724 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -794,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -803,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "" -#: ../dgit:3804 +#: ../dgit:3879 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3842 +#: ../dgit:3917 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3861 +#: ../dgit:3936 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:3975 +#: ../dgit:4050 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4053 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3986 +#: ../dgit:4061 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "" -#: ../dgit:4120 +#: ../dgit:4195 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4190 +#: ../dgit:4265 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4251 +#: ../dgit:4326 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4344 +#: ../dgit:4419 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4353 +#: ../dgit:4428 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4381 +#: ../dgit:4456 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1053,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1068,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4503 +#: ../dgit:4578 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1093,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4546 +#: ../dgit:4621 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4550 +#: ../dgit:4625 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4635 +#: ../dgit:4710 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4652 +#: ../dgit:4727 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1147,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4695 +#: ../dgit:4770 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4785 +#: ../dgit:4860 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4892 +#: ../dgit:4967 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1303,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5349 +#: ../dgit:5424 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1335,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5379 +#: ../dgit:5454 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1353,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5569 +#: ../dgit:5644 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1417,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5708 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5914 +#: ../dgit:5992 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6052 +#: ../dgit:6130 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1486,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6103 +#: ../dgit:6181 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6106 +#: ../dgit:6184 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgstr "" -#: ../dgit:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6116 +#: ../dgit:6194 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6129 +#: ../dgit:6207 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6136 +#: ../dgit:6214 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1546,98 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6273 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6223 -#, perl-format +#: ../dgit:6302 msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6240 +#: ../dgit:6317 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6352 +#: ../dgit:6432 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1645,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "" -#: ../dgit:6506 +#: ../dgit:6586 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6738 +#: ../dgit:6818 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6754 +#: ../dgit:6834 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6889 +#: ../dgit:6969 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1782,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -1804,139 +1854,139 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:6939 +#: ../dgit:7019 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:6943 +#: ../dgit:7023 #, perl-format msgid "import %s requires .../%s, but it does not exist" msgstr "" -#: ../dgit:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "" -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7027 +#: ../dgit:7107 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7329 +#: ../dgit:7414 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1944,44 +1994,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7404 +#: ../dgit:7489 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1994,7 +2044,7 @@ msgid "" " git-debrebase [<options>] prepush [--prose=...]\n" " git-debrebase [<options>] quick|conclude\n" " git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n" -" git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n" +" git-debrebase [<options>] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2479,15 +2529,15 @@ msgstr "" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2495,58 +2545,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2554,12 +2604,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2567,16 +2617,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2584,84 +2634,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: 2018-12-05 20:40+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -35,8 +35,9 @@ msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" #: ../dgit:260 -#, perl-format -msgid "%s: package %s does not exist in suite %s\n" +#, fuzzy, perl-format +#| msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: pakket %s bestaat niet in suite %s\n" #: ../dgit:483 @@ -510,49 +511,100 @@ msgstr "(basis)-distributie wordt benaderd" msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, fuzzy, perl-format +#| msgid "opendir build-products-dir %s: %s" +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "opendir build-products-dir %s: %s" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, fuzzy, perl-format +#| msgid "missing field %s in %s" +msgid "check orig file %s in ..: %s" +msgstr "ontbrekend veld %s in %s" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, fuzzy, perl-format +#| msgid "%s: warning: removing from %s: %s\n" +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" + +#: ../dgit:2249 +#, fuzzy, perl-format +#| msgid "%s: warning: removing from %s: %s\n" +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" + +#: ../dgit:2252 +#, fuzzy, perl-format +#| msgid "failed to mkdir a playground %s: %s" +msgid "failed to make %s a hardlink to %s: %s" +msgstr "mkdir van een speelplaats %s mislukte: %s" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "Importeren van %s" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -565,21 +617,21 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "Gegeven %s (%s) uit archiefsuite %s\n" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -592,12 +644,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -606,12 +658,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -619,24 +671,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2773 +#: ../dgit:2844 #, 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:2817 +#: ../dgit:2888 #, 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:2832 +#: ../dgit:2903 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" @@ -646,7 +698,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.\n" -#: ../dgit:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -662,44 +714,44 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "%s: GEEN hash van git" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "%s: git info werd opgegeven (%s)" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "%s: git hash werd opgegeven" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "%s: ongeldige Dgit info" -#: ../dgit:2988 +#: ../dgit:3059 #, 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:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:2998 +#: ../dgit:3069 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -708,7 +760,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:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -721,30 +773,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:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "modificatieplan (rewrite map) " -#: ../dgit:3035 +#: ../dgit:3106 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:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3041 +#: ../dgit:3112 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:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -753,27 +805,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -789,15 +841,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -809,7 +861,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -824,7 +876,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -835,19 +887,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -863,15 +915,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -879,16 +931,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3507 +#: ../dgit:3579 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:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -899,32 +951,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3652 +#: ../dgit:3724 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:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -935,7 +987,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -949,34 +1001,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3804 +#: ../dgit:3879 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -986,33 +1038,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3842 +#: ../dgit:3917 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:3861 +#: ../dgit:3936 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1021,15 +1073,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:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1037,7 +1089,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1045,60 +1097,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:3975 +#: ../dgit:4050 #, 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:3978 +#: ../dgit:4053 #, 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:3986 +#: ../dgit:4061 #, 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:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" @@ -1107,81 +1159,81 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4120 +#: ../dgit:4195 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" "| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite " "nodig? Raadpleeg dgit(1).\n" -#: ../dgit:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4190 +#: ../dgit:4265 #, 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:4251 +#: ../dgit:4326 #, 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:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "%s release %s voor %s (%s) [dgit]\n" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" @@ -1190,7 +1242,7 @@ msgstr "" "%s release %s voor %s (%s)\n" "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4344 +#: ../dgit:4419 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1199,14 +1251,14 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4353 +#: ../dgit:4428 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, " "gebruik dan --new" -#: ../dgit:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1215,12 +1267,12 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4381 +#: ../dgit:4456 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen" -#: ../dgit:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1233,7 +1285,7 @@ msgstr "" "Gebruik de juiste --quilt-optie of pas uw git config aan.\n" "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" -#: ../dgit:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1242,7 +1294,7 @@ msgstr "" "--quilt=%s maar geen gecachete dgit-weergave:\n" " werd HEAD misschien gewijzigd sinds dgit build[-source]?" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1255,17 +1307,17 @@ msgstr "" "Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " "u --deliberately-not-fast-forward." -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "bezig na te gaan dat %s overeenkomt met HEAD" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "HEAD geeft een andere boom op aan %s:\n" -#: ../dgit:4503 +#: ../dgit:4578 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" @@ -1274,7 +1326,7 @@ msgstr "" "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n" "Om alle verschillen te zien, gebruikt u git diff %s %s\n" -#: ../dgit:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1286,7 +1338,7 @@ msgstr "" "zien,\n" " gebruikt u git diff %s %s\n" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1295,19 +1347,19 @@ msgstr "" "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " "u dgit -C gebruiken" -#: ../dgit:4546 +#: ../dgit:4621 msgid "uploading binaries, although distro policy is source only" msgstr "" "bezig met uploaden van binaire pakketten, hoewel het beleid van de " "distributie uitsluitend broncode (source only) voorschrijft" -#: ../dgit:4550 +#: ../dgit:4625 msgid "source-only upload, although distro policy requires .debs" msgstr "" "upload van uitsluitend broncode (source-only), hoewel het beleid van de " "distributie .deb's vereist" -#: ../dgit:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" @@ -1317,12 +1369,12 @@ msgstr "" "is\n" "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1331,7 +1383,7 @@ msgstr "" "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " "probleem.\n" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1340,7 +1392,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4635 +#: ../dgit:4710 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" @@ -1350,7 +1402,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4652 +#: ../dgit:4727 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1368,84 +1420,84 @@ msgstr "" "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:4695 +#: ../dgit:4770 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als " "argument" -#: ../dgit:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "incorrecte argumenten voor dgit clone" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "verwijder %s: %s\n" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleer of %s moet verwijderd worden: %s\n" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "incorrecte argumenten voor dgit fetch of dgit pull" -#: ../dgit:4785 +#: ../dgit:4860 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet " "ondersteund\n" -#: ../dgit:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout heeft een suite nodig als argument" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "bezig met opzetten van vcs-git: %s\n" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "vcs git is reeds geconfigureerd: %s\n" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "url van vcs-git wordt veranderd naar: %s\n" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "bezig met ophalen (%s)\n" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "incorrecte argumenten voor dgit %s" -#: ../dgit:4892 +#: ../dgit:4967 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel " "wordt %s opgegeven" -#: ../dgit:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1453,34 +1505,34 @@ msgstr "" "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " "de aanroepende computer zijn %s" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "maak %s aan: %s" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "dochterproces op de bouwcomputer faalde: %s" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "alles klaar\n" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "slechte parameter-spec" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" @@ -1488,45 +1540,45 @@ msgstr "" "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " "%s niet ondersteunt" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "buildinfo-incongruentie in veld %s" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "buildinfo bevat ongeoorloofd veld %s" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "geen echt bestand of symbolische koppeling\n" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "modus of type gewijzigd\n" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "creatie met een niet-standaard modus\n" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "dgit-weergave: er zijn wijzigingen vereist..." -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1537,7 +1589,7 @@ msgstr "" "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" " %s\n" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1547,7 +1599,7 @@ msgstr "" " (een git-boom zonder dat de patches toegepast worden)\n" " maar de git-boom verschilt van orig in de toeleveraarsbestanden." -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1556,7 +1608,7 @@ msgstr "" " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" "wachtrij?" -#: ../dgit:5349 +#: ../dgit:5424 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1567,12 +1619,12 @@ msgstr "" " maar de git-boom verschilt van het resultaat van het toepassen van\n" " debian/patches op de broncode van de toeleveraar.\n" -#: ../dgit:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1583,20 +1635,20 @@ msgstr "" " te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n" " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n" -#: ../dgit:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " "representeren" -#: ../dgit:5379 +#: ../dgit:5454 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op " "te tekenen" -#: ../dgit:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1611,43 +1663,43 @@ msgstr "" "gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n" "de weergave van het pakket uit het officiële Debian-archief.\n" -#: ../dgit:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "omgezet" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" @@ -1656,23 +1708,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5569 +#: ../dgit:5644 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:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1683,72 +1735,72 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5633 +#: ../dgit:5708 #, 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:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5914 +#: ../dgit:5992 #, 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:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6052 +#: ../dgit:6130 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1762,16 +1814,16 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6103 +#: ../dgit:6181 #, 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:6106 +#: ../dgit:6184 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1780,49 +1832,49 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: HEAD %s o+d/p HEAD %s o+d/p" -#: ../dgit:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6116 +#: ../dgit:6194 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:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6129 +#: ../dgit:6207 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:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6136 +#: ../dgit:6214 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:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1837,18 +1889,22 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6195 +#: ../dgit:6273 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" "dgit: Bezig toepassen van patches terug ongedaan te maken om de boom op te " "schonen." -#: ../dgit:6223 -#, perl-format +#: ../dgit:6302 +#, fuzzy +#| msgid "" +#| "%s\n" +#| "If this is just missing .gitignore entries, use a different clean\n" +#| "mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +#| "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" "%s\n" @@ -1858,91 +1914,97 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6240 +#: ../dgit:6317 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:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "-p is niet toegestaan met dgit %s" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6352 +#: ../dgit:6432 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:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1954,11 +2016,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6506 +#: ../dgit:6586 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1969,30 +2031,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2000,21 +2062,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6738 +#: ../dgit:6818 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" @@ -2023,7 +2085,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2031,7 +2093,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6754 +#: ../dgit:6834 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2040,65 +2102,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6889 +#: ../dgit:6969 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:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2109,21 +2171,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:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -2135,98 +2197,98 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:6939 +#: ../dgit:7019 #, 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:6943 +#: ../dgit:7023 #, perl-format msgid "import %s requires .../%s, but it does not exist" msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" -#: ../dgit:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7027 +#: ../dgit:7107 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:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2234,42 +2296,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7329 +#: ../dgit:7414 #, 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:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2280,53 +2342,65 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7404 +#: ../dgit:7489 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" "dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " "weergave" -#: ../dgit:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "onbekende clean-modus `%s'" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" #: ../git-debrebase:44 +#, fuzzy +#| msgid "" +#| "usages:\n" +#| " git-debrebase [<options>] [--|-i <git rebase options...>]\n" +#| " git-debrebase [<options>] status\n" +#| " git-debrebase [<options>] prepush [--prose=...]\n" +#| " git-debrebase [<options>] quick|conclude\n" +#| " git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n" +#| " git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n" +#| " ...\n" +#| "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in " +#| "dgit).\n" msgid "" "usages:\n" " git-debrebase [<options>] [--|-i <git rebase options...>]\n" @@ -2334,7 +2408,7 @@ msgid "" " git-debrebase [<options>] prepush [--prose=...]\n" " git-debrebase [<options>] quick|conclude\n" " git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n" -" git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n" +" git-debrebase [<options>] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2864,16 +2938,16 @@ msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2885,12 +2959,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2900,47 +2974,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" "geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2951,14 +3025,14 @@ msgstr "" "Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" "dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" "%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " "(patched-unapplied) (gbp), Oké\n" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2969,17 +3043,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2990,58 +3064,58 @@ msgstr "" "%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" "%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -3052,31 +3126,31 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" "Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" |