From 959378575613bf9b08ad8f624f5145b606cd60d0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 1 Mar 2019 21:54:07 +0000 Subject: i18n-commit - autogenerated --- po/en_US.po | 947 +++++++++++++++++++++++++++---------------------------- po/messages.pot | 949 +++++++++++++++++++++++++++---------------------------- po/nl.po | 950 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 1429 insertions(+), 1417 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 901bb4e..b0e64d4 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: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -17,78 +17,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:241 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:248 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:256 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:261 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:484 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:489 ../dgit:495 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:490 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:498 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:505 +#: ../dgit:508 msgid "protocol message" msgstr "" -#: ../dgit:513 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:534 +#: ../dgit:537 msgid "bad byte count" msgstr "" -#: ../dgit:537 +#: ../dgit:540 msgid "data block" msgstr "" -#: ../dgit:618 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:630 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:632 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:657 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +109,141 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:676 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:680 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:685 +#: ../dgit:688 msgid "too few arguments" msgstr "" -#: ../dgit:796 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:799 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:819 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:860 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:875 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:891 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:911 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:922 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:926 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1091 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1137 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1158 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1166 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1170 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1186 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1190 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1192 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1194 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1196 ../dgit:1221 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1210 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1212 +#: ../dgit:1215 msgid "bad component" msgstr "" -#: ../dgit:1215 +#: ../dgit:1218 msgid "bad filename" msgstr "" -#: ../dgit:1217 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "" -#: ../dgit:1268 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1352 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +251,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1374 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1402 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1403 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1508 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1699 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1702 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1704 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1724 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1730 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1757 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1774 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1789 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1804 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1841 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1887 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1898 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1944 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1953 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1957 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1963 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2003 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2016 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2029 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2045 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2050 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2058 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2065 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2093 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2101 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2104 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2128 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2151 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +422,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2163 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2194 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2196 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2198 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2203 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2228 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2232 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2234 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2237 +#: ../dgit:2240 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2246 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2250 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2253 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2259 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2291 ../dgit:2296 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2311 ../dgit:2318 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2383 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2447 ../dgit:5971 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "" -#: ../dgit:2465 +#: ../dgit:2468 msgid "package changelog" msgstr "" -#: ../dgit:2505 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2524 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2605 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2624 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2633 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2648 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2652 +#: ../dgit:2655 msgid "Import of source package" msgstr "" -#: ../dgit:2665 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2669 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -560,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2711 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2715 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2719 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2735 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2830 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2845 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2889 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2907 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2909 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2976 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3025 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3029 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3036 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3038 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3060 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3065 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3070 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3080 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3100 +#: ../dgit:3103 msgid "rewrite map" msgstr "" -#: ../dgit:3107 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3111 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3113 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3120 +#: ../dgit:3123 msgid "additional commits" msgstr "" -#: ../dgit:3123 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3148 +#: ../dgit:3151 msgid "last upload to archive" msgstr "" -#: ../dgit:3152 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "" -#: ../dgit:3235 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3242 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3247 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3275 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -722,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3288 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3291 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3312 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -738,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3321 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -748,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3406 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3419 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3437 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3439 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3450 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -778,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3465 +#: ../dgit:3468 msgid "fetched source tree" msgstr "" -#: ../dgit:3501 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3566 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3580 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3595 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3622 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3644 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3652 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3691 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3723 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3725 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3764 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3778 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -849,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3793 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3811 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3819 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3834 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3850 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "" -#: ../dgit:3854 +#: ../dgit:3857 msgid "starting new git history" msgstr "" -#: ../dgit:3880 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3885 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3897 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3899 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3907 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3918 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3937 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3954 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3957 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3961 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4004 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4009 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4019 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4025 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4051 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4054 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4062 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4071 +#: ../dgit:4074 msgid "version currently in archive" msgstr "" -#: ../dgit:4080 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4088 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4098 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4101 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4115 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4171 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4180 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4185 msgid "dgit view tag" msgstr "" -#: ../dgit:4183 +#: ../dgit:4186 msgid "current archive contents" msgstr "" -#: ../dgit:4196 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4207 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4211 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4224 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4232 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4244 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4266 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4327 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4355 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4368 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4420 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4429 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4434 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4457 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4474 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1099,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4498 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4529 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1114,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4539 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4573 ../dgit:4585 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4579 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4589 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1139,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4600 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4622 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4626 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4630 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4637 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4681 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4694 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4711 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4728 +#: ../dgit:4731 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" @@ -1193,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4759 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4771 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4782 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4788 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4802 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4806 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4844 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4861 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4870 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4932 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4935 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4937 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4942 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4957 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4968 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5006 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5086 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5123 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5126 +#: ../dgit:5129 msgid "all done\n" msgstr "" -#: ../dgit:5135 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5143 +#: ../dgit:5146 msgid "bad param spec" msgstr "" -#: ../dgit:5149 +#: ../dgit:5152 msgid "bad previously spec" msgstr "" -#: ../dgit:5168 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5213 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5216 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5257 +#: ../dgit:5260 msgid "remote changes file" msgstr "" -#: ../dgit:5332 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5339 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "" -#: ../dgit:5342 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5346 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5376 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5405 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1349,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5412 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5418 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5425 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5432 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5441 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1381,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5450 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5455 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5460 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1399,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5482 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5496 +#: ../dgit:5499 msgid "converted" msgstr "" -#: ../dgit:5497 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5562 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5580 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5589 +#: ../dgit:5592 msgid "root commit" msgstr "" -#: ../dgit:5595 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5607 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5626 +#: ../dgit:5629 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5645 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5648 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5660 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5667 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5701 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5707 msgid "is series file\n" msgstr "" -#: ../dgit:5705 +#: ../dgit:5708 msgid "too long\n" msgstr "" -#: ../dgit:5709 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5738 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5881 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5891 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5993 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6024 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6029 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6040 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6131 +#: ../dgit:6134 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1532,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6145 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6182 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6185 +#: ../dgit:6188 #, 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:6191 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6202 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6205 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6208 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6211 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6215 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6224 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6262 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6274 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6303 +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6315 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6318 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6321 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6339 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6353 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6366 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6405 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6407 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6433 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6439 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6442 +#: ../dgit:6445 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6485 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6523 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6530 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6537 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6541 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6546 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6549 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6562 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6580 +#: ../dgit:6583 msgid "build successful\n" msgstr "" -#: ../dgit:6587 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6697 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6732 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6752 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6765 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6769 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6776 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6782 +#: ../dgit:6785 msgid "source changes file" msgstr "" -#: ../dgit:6784 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6804 ../dgit:6806 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6819 +#: ../dgit:6822 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6831 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6835 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6865 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6887 +#: ../dgit:6890 msgid "source tree" msgstr "" -#: ../dgit:6889 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6902 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6906 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6910 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6927 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6932 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6934 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6945 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6948 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6959 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6970 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6979 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6986 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6988 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6993 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6998 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,129 +1854,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7016 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7018 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7037 +#: ../dgit:7031 +#, perl-format +msgid "import %s requires %s, but: %s" +msgstr "" + +#: ../dgit:7050 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7041 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7053 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7055 +#: ../dgit:7068 msgid "Import, merging." msgstr "" -#: ../dgit:7069 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7078 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7085 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7091 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7105 +#: ../dgit:7118 msgid "need destination argument" msgstr "" -#: ../dgit:7110 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7118 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7129 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7135 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7142 ../dgit:7148 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7154 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7201 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7240 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7244 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7335 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7355 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7410 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7425 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7429 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7435 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1984,44 +1989,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7452 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7465 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7485 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7495 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7500 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7511 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7532 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7533 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7552 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2325,7 +2330,7 @@ msgstr "" msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2333,201 +2338,201 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "old anchor is recognized due to --anchor, cannot check upstream" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2535,58 +2540,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2594,12 +2599,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2607,16 +2612,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2624,84 +2629,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 05475eb..69096f0 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 15:31+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,78 +40,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:241 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:248 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:256 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:261 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:484 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:489 ../dgit:495 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:490 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:498 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:505 +#: ../dgit:508 msgid "protocol message" msgstr "" -#: ../dgit:513 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:534 +#: ../dgit:537 msgid "bad byte count" msgstr "" -#: ../dgit:537 +#: ../dgit:540 msgid "data block" msgstr "" -#: ../dgit:618 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:630 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:632 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:657 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -132,141 +132,141 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:676 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:680 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:685 +#: ../dgit:688 msgid "too few arguments" msgstr "" -#: ../dgit:796 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:799 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:819 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:860 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:875 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:891 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:911 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:922 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:926 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1091 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1137 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1158 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1166 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1170 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1186 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1190 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1192 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1194 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1196 ../dgit:1221 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1210 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1212 +#: ../dgit:1215 msgid "bad component" msgstr "" -#: ../dgit:1215 +#: ../dgit:1218 msgid "bad filename" msgstr "" -#: ../dgit:1217 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "" -#: ../dgit:1268 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1352 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -274,163 +274,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1374 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1402 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1403 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1508 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1699 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1702 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1704 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1724 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1730 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1757 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1774 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1789 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1804 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1841 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1887 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1898 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1944 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1953 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1957 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1963 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2003 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2016 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2029 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2045 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2050 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2058 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2065 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2093 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2101 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2104 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2128 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2151 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -445,113 +445,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2163 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2194 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2196 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2198 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2203 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2228 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2232 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2234 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2237 +#: ../dgit:2240 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2246 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2250 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2253 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2259 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2291 ../dgit:2296 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2311 ../dgit:2318 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2383 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2447 ../dgit:5971 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "" -#: ../dgit:2465 +#: ../dgit:2468 msgid "package changelog" msgstr "" -#: ../dgit:2505 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2524 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2605 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2624 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2633 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -560,21 +560,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2648 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2652 +#: ../dgit:2655 msgid "Import of source package" msgstr "" -#: ../dgit:2665 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2669 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -583,51 +583,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2711 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2715 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2719 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2735 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2830 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2845 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2889 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2907 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2909 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -637,49 +637,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2976 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3025 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3029 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3036 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3038 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3060 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3065 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3070 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3080 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -688,54 +688,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3100 +#: ../dgit:3103 msgid "rewrite map" msgstr "" -#: ../dgit:3107 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3111 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3113 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3120 +#: ../dgit:3123 msgid "additional commits" msgstr "" -#: ../dgit:3123 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3148 +#: ../dgit:3151 msgid "last upload to archive" msgstr "" -#: ../dgit:3152 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "" -#: ../dgit:3235 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3242 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3247 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3275 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -745,15 +745,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3288 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3291 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3312 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -761,7 +761,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3321 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -771,7 +771,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3406 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -779,19 +779,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3419 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3437 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3439 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3450 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -801,30 +801,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3465 +#: ../dgit:3468 msgid "fetched source tree" msgstr "" -#: ../dgit:3501 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3566 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3580 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3595 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3622 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -832,30 +832,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3644 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3652 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3691 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3723 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3725 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3764 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -863,7 +863,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3778 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -872,248 +872,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3793 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3811 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3819 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3834 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3850 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "" -#: ../dgit:3854 +#: ../dgit:3857 msgid "starting new git history" msgstr "" -#: ../dgit:3880 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3885 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3897 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3899 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3907 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3918 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3937 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3954 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3957 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3961 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4004 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4009 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4019 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4025 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4051 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4054 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4062 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4071 +#: ../dgit:4074 msgid "version currently in archive" msgstr "" -#: ../dgit:4080 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4088 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4098 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4101 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4115 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4171 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4180 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4185 msgid "dgit view tag" msgstr "" -#: ../dgit:4183 +#: ../dgit:4186 msgid "current archive contents" msgstr "" -#: ../dgit:4196 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4207 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4211 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4224 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4232 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4244 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4266 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4327 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4355 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4368 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4420 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4429 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4434 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4457 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4474 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1122,14 +1122,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4498 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4529 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1137,24 +1137,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4539 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4573 ../dgit:4585 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4579 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4589 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1162,52 +1162,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4600 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4622 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4626 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4630 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4637 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4681 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4694 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4711 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4728 +#: ../dgit:4731 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" @@ -1216,155 +1216,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4759 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4771 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4782 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4788 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4802 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4806 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4844 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4861 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4870 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4932 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4935 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4937 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4942 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4957 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4968 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5006 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5086 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5123 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5126 +#: ../dgit:5129 msgid "all done\n" msgstr "" -#: ../dgit:5135 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5143 +#: ../dgit:5146 msgid "bad param spec" msgstr "" -#: ../dgit:5149 +#: ../dgit:5152 msgid "bad previously spec" msgstr "" -#: ../dgit:5168 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5213 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5216 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5257 +#: ../dgit:5260 msgid "remote changes file" msgstr "" -#: ../dgit:5332 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5339 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "" -#: ../dgit:5342 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5346 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5376 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5405 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1372,31 +1372,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5412 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5418 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5425 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5432 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5441 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1404,16 +1404,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5450 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5455 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5460 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1422,63 +1422,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5482 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5496 +#: ../dgit:5499 msgid "converted" msgstr "" -#: ../dgit:5497 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5562 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5580 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5589 +#: ../dgit:5592 msgid "root commit" msgstr "" -#: ../dgit:5595 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5607 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5626 +#: ../dgit:5629 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5645 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5648 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5660 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1486,68 +1486,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5667 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5701 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5707 msgid "is series file\n" msgstr "" -#: ../dgit:5705 +#: ../dgit:5708 msgid "too long\n" msgstr "" -#: ../dgit:5709 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5738 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5881 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5891 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5993 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6024 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6029 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6040 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6131 +#: ../dgit:6134 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" @@ -1555,58 +1555,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6145 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6182 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6185 +#: ../dgit:6188 #, 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:6191 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6202 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6205 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6208 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6211 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6215 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6224 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6262 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1615,102 +1615,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6274 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6303 +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6315 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6318 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6321 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6339 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6353 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6366 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6405 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6407 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6433 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6439 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6442 +#: ../dgit:6445 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6485 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6523 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6530 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6537 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6541 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6546 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6549 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6562 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1718,136 +1718,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6580 +#: ../dgit:6583 msgid "build successful\n" msgstr "" -#: ../dgit:6587 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6697 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6732 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6752 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6765 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6769 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6776 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6782 +#: ../dgit:6785 msgid "source changes file" msgstr "" -#: ../dgit:6784 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6804 ../dgit:6806 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6819 +#: ../dgit:6822 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6831 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6835 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6865 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6887 +#: ../dgit:6890 msgid "source tree" msgstr "" -#: ../dgit:6889 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6902 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6906 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6910 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6927 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6932 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6934 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6945 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6948 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6959 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6970 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6979 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1855,21 +1855,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6986 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6988 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6993 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6998 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -1877,129 +1877,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7016 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7018 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7037 +#: ../dgit:7031 +#, perl-format +msgid "import %s requires %s, but: %s" +msgstr "" + +#: ../dgit:7050 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7041 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7053 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7055 +#: ../dgit:7068 msgid "Import, merging." msgstr "" -#: ../dgit:7069 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7078 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7085 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7091 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7105 +#: ../dgit:7118 msgid "need destination argument" msgstr "" -#: ../dgit:7110 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7118 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7129 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7135 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7142 ../dgit:7148 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7154 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7201 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7240 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7244 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7335 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7355 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7410 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7425 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7429 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7435 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2007,44 +2012,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7452 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7465 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7485 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7495 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7500 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7511 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7532 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7533 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7552 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2348,7 +2353,7 @@ msgstr "" msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2356,201 +2361,201 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2558,58 +2563,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2617,12 +2622,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2630,16 +2635,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2647,84 +2652,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4609d22..4aad97d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" "PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -19,79 +19,79 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:241 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:248 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:256 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:261 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: broncodepakket %s bestaat niet in suite %s\n" -#: ../dgit:484 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:489 ../dgit:495 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:490 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:498 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:505 +#: ../dgit:508 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:513 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:534 +#: ../dgit:537 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:537 +#: ../dgit:540 msgid "data block" msgstr "gegevensblok" -#: ../dgit:618 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "ophalen (fetch) van %s mislukt: %s" -#: ../dgit:630 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:632 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:657 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -131,13 +131,13 @@ msgstr "" " -c= configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:676 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" "Misschien zit de upload vast in incoming. De versie van git wordt " "gebruikt.\n" -#: ../dgit:680 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" @@ -146,22 +146,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:685 +#: ../dgit:688 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:796 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:799 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" "waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!" -#: ../dgit:819 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" @@ -170,39 +170,39 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:860 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" "slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)" -#: ../dgit:875 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:891 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'" -#: ../dgit:911 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" "alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een " "(auto)" -#: ../dgit:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "interne fout" -#: ../dgit:922 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:926 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -211,13 +211,13 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1091 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" "meerdere met een komma van elkaar gescheiden suites worden door deze " "bewerking niet ondersteund" -#: ../dgit:1137 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " @@ -226,68 +226,68 @@ msgstr "" "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl " "ertoe te brengen exact die EE-sleutel (%s) te gebruiken" -#: ../dgit:1158 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1166 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" -#: ../dgit:1170 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1186 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1190 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1192 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1194 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1196 ../dgit:1221 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1210 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1212 +#: ../dgit:1215 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1215 +#: ../dgit:1218 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1217 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1268 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1352 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -300,21 +300,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1374 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1402 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1403 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1508 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -323,138 +323,138 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1699 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1702 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1704 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1724 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten" -#: ../dgit:1730 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1757 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1774 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "het verzoek git check leverde onverwachte resultaten op - " -#: ../dgit:1789 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1804 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1841 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1887 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1898 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1944 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:1953 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1957 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1963 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2003 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2016 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2029 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2045 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2050 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2058 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2065 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2093 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2101 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2104 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2128 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -463,7 +463,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2151 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -490,7 +490,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2163 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -498,24 +498,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2194 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2196 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2198 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2203 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2228 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -523,85 +523,85 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2232 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2234 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2237 +#: ../dgit:2240 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2246 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2250 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2253 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2259 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2291 ../dgit:2296 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2311 ../dgit:2318 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2383 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2447 ../dgit:5971 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2465 +#: ../dgit:2468 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2505 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2524 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "Importeren van %s" -#: ../dgit:2605 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2624 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2633 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -614,21 +614,21 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2648 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2652 +#: ../dgit:2655 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2665 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "Gegeven %s (%s) uit archiefsuite %s\n" -#: ../dgit:2669 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -641,12 +641,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2711 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2715 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -655,12 +655,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2719 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2735 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -668,24 +668,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2830 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2845 +#: ../dgit:2848 #, 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:2889 +#: ../dgit:2892 #, 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:2904 +#: ../dgit:2907 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" @@ -695,7 +695,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:2909 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -711,44 +711,44 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2976 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" -#: ../dgit:3025 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "%s: GEEN hash van git" -#: ../dgit:3029 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "%s: git info werd opgegeven (%s)" -#: ../dgit:3036 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "%s: git hash werd opgegeven" -#: ../dgit:3038 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "%s: ongeldige Dgit info" -#: ../dgit:3060 +#: ../dgit:3063 #, 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:3065 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3070 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -757,7 +757,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:3080 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -770,30 +770,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:3100 +#: ../dgit:3103 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3107 +#: ../dgit:3110 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:3111 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3113 +#: ../dgit:3116 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:3120 +#: ../dgit:3123 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3123 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -802,27 +802,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3148 +#: ../dgit:3151 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3152 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3235 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3242 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3247 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3275 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -838,15 +838,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3288 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3291 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3312 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -858,7 +858,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3321 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -873,7 +873,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3406 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -884,19 +884,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3419 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3437 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3439 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3450 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -912,15 +912,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3465 +#: ../dgit:3468 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3501 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3566 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -928,16 +928,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3580 +#: ../dgit:3583 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:3595 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3622 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -948,32 +948,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3644 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3652 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3691 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3723 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3725 +#: ../dgit:3728 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:3764 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -984,7 +984,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3778 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -998,34 +998,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3793 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3811 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3819 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3834 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3850 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3854 +#: ../dgit:3857 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3880 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -1035,33 +1035,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3885 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3897 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3899 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3907 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3918 +#: ../dgit:3921 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:3937 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1070,15 +1070,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:3954 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3957 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3961 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1086,7 +1086,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4004 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1094,60 +1094,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4009 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4019 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4025 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4051 +#: ../dgit:4054 #, 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:4054 +#: ../dgit:4057 #, 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:4062 +#: ../dgit:4065 #, 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:4071 +#: ../dgit:4074 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4080 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4088 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4098 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4101 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" @@ -1156,81 +1156,81 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4115 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4171 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4180 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4182 +#: ../dgit:4185 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4183 +#: ../dgit:4186 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4196 +#: ../dgit:4199 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:4206 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4207 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4211 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4224 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4232 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4244 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4266 +#: ../dgit:4269 #, 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:4327 +#: ../dgit:4330 #, 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:4355 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "%s release %s voor %s (%s) [dgit]\n" -#: ../dgit:4368 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" @@ -1239,7 +1239,7 @@ msgstr "" "%s release %s voor %s (%s)\n" "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4420 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1248,14 +1248,14 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4429 +#: ../dgit:4432 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:4434 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1264,12 +1264,12 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4457 +#: ../dgit:4460 #, 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:4474 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1282,7 +1282,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:4498 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1291,7 +1291,7 @@ msgstr "" "--quilt=%s maar geen gecachete dgit-weergave:\n" " werd HEAD misschien gewijzigd sinds dgit build[-source]?" -#: ../dgit:4529 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1304,17 +1304,17 @@ msgstr "" "Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " "u --deliberately-not-fast-forward." -#: ../dgit:4539 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "bezig na te gaan dat %s overeenkomt met HEAD" -#: ../dgit:4573 ../dgit:4585 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "HEAD geeft een andere boom op aan %s:\n" -#: ../dgit:4579 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" @@ -1323,7 +1323,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:4589 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1335,7 +1335,7 @@ msgstr "" "zien,\n" " gebruikt u git diff %s %s\n" -#: ../dgit:4600 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1344,19 +1344,19 @@ msgstr "" "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " "u dgit -C gebruiken" -#: ../dgit:4622 +#: ../dgit:4625 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:4626 +#: ../dgit:4629 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:4630 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" @@ -1366,12 +1366,12 @@ msgstr "" "is\n" "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" -#: ../dgit:4637 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" -#: ../dgit:4681 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1380,7 +1380,7 @@ msgstr "" "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " "probleem.\n" -#: ../dgit:4694 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1389,7 +1389,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4711 +#: ../dgit:4714 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" @@ -1399,7 +1399,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4728 +#: ../dgit:4731 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" @@ -1417,84 +1417,84 @@ msgstr "" "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4759 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:4771 +#: ../dgit:4774 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:4782 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "incorrecte argumenten voor dgit clone" -#: ../dgit:4788 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:4802 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "verwijder %s: %s\n" -#: ../dgit:4806 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleer of %s moet verwijderd worden: %s\n" -#: ../dgit:4844 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "incorrecte argumenten voor dgit fetch of dgit pull" -#: ../dgit:4861 +#: ../dgit:4864 #, 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:4870 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout heeft een suite nodig als argument" -#: ../dgit:4932 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "bezig met opzetten van vcs-git: %s\n" -#: ../dgit:4935 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "vcs git is reeds geconfigureerd: %s\n" -#: ../dgit:4937 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "url van vcs-git wordt veranderd naar: %s\n" -#: ../dgit:4942 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "bezig met ophalen (%s)\n" -#: ../dgit:4957 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "incorrecte argumenten voor dgit %s" -#: ../dgit:4968 +#: ../dgit:4971 #, 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:5006 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1502,34 +1502,34 @@ msgstr "" "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " "de aanroepende computer zijn %s" -#: ../dgit:5086 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "maak %s aan: %s" -#: ../dgit:5123 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "dochterproces op de bouwcomputer faalde: %s" -#: ../dgit:5126 +#: ../dgit:5129 msgid "all done\n" msgstr "alles klaar\n" -#: ../dgit:5135 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5143 +#: ../dgit:5146 msgid "bad param spec" msgstr "slechte parameter-spec" -#: ../dgit:5149 +#: ../dgit:5152 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5168 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" @@ -1537,45 +1537,45 @@ msgstr "" "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " "%s niet ondersteunt" -#: ../dgit:5213 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "buildinfo-incongruentie in veld %s" -#: ../dgit:5216 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "buildinfo bevat ongeoorloofd veld %s" -#: ../dgit:5257 +#: ../dgit:5260 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5332 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "geen echt bestand of symbolische koppeling\n" -#: ../dgit:5338 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "modus of type gewijzigd\n" -#: ../dgit:5339 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5342 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5346 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "creatie met een niet-standaard modus\n" -#: ../dgit:5376 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "dgit-weergave: er zijn wijzigingen vereist..." -#: ../dgit:5405 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1586,7 +1586,7 @@ msgstr "" "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" " %s\n" -#: ../dgit:5412 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1596,7 +1596,7 @@ msgstr "" " (een git-boom zonder dat de patches toegepast worden)\n" " maar de git-boom verschilt van orig in de toeleveraarsbestanden." -#: ../dgit:5418 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1605,7 +1605,7 @@ msgstr "" " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" "wachtrij?" -#: ../dgit:5425 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1616,12 +1616,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:5432 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" -#: ../dgit:5441 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1632,20 +1632,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:5450 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " "representeren" -#: ../dgit:5455 +#: ../dgit:5458 #, 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:5460 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1660,43 +1660,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:5482 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" -#: ../dgit:5496 +#: ../dgit:5499 msgid "converted" msgstr "omgezet" -#: ../dgit:5497 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5562 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5580 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5589 +#: ../dgit:5592 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5595 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5607 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5626 +#: ../dgit:5629 #, perl-format msgid "" "\n" @@ -1705,23 +1705,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5633 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5645 +#: ../dgit:5648 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:5648 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5660 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1732,72 +1732,72 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5667 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5701 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5702 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5703 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5704 +#: ../dgit:5707 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5705 +#: ../dgit:5708 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5709 +#: ../dgit:5712 #, 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:5738 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5881 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5891 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5993 +#: ../dgit:5996 #, 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:6024 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6029 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6040 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6131 +#: ../dgit:6134 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" @@ -1811,16 +1811,16 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6145 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6182 +#: ../dgit:6185 #, 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:6185 +#: ../dgit:6188 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1829,49 +1829,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:6191 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6195 +#: ../dgit:6198 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:6202 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6205 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6208 +#: ../dgit:6211 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:6211 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6215 +#: ../dgit:6218 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:6224 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6262 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1886,13 +1886,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6274 +#: ../dgit:6277 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:6303 +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" @@ -1904,18 +1904,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6315 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6318 +#: ../dgit:6321 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:6321 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1923,80 +1923,80 @@ msgstr "" "de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n" "U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen." -#: ../dgit:6339 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6353 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6366 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "-p is niet toegestaan met dgit %s" -#: ../dgit:6405 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6407 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6433 +#: ../dgit:6436 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:6439 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6442 +#: ../dgit:6445 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:6485 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6523 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6530 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6537 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6541 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6546 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6549 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6562 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2008,11 +2008,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6580 +#: ../dgit:6583 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6587 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2023,30 +2023,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6697 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6732 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6752 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6765 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6769 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6776 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2054,21 +2054,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6782 +#: ../dgit:6785 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6784 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6804 ../dgit:6806 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6819 +#: ../dgit:6822 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" @@ -2077,7 +2077,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6831 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2085,7 +2085,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6835 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2094,65 +2094,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6865 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6887 +#: ../dgit:6890 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6889 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6902 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6906 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6910 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6927 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6932 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6934 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6945 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6948 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6959 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6970 +#: ../dgit:6973 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:6979 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2163,21 +2163,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:6986 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6988 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6993 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:6998 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -2189,88 +2189,93 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7016 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7018 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7037 +#: ../dgit:7031 +#, perl-format +msgid "import %s requires %s, but: %s" +msgstr "importeren van %s vereist %s, maar: %s" + +#: ../dgit:7050 #, 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:7041 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7042 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7053 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7055 +#: ../dgit:7068 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7069 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7078 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7085 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7091 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7105 +#: ../dgit:7118 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7110 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7118 +#: ../dgit:7131 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:7129 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7135 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7142 ../dgit:7148 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7154 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7201 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2278,42 +2283,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7240 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7244 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7335 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7355 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7410 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7425 +#: ../dgit:7438 #, 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:7429 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7435 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2324,48 +2329,48 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7452 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7465 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7485 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7495 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7500 +#: ../dgit:7513 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:7511 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "onbekende clean-modus `%s'" -#: ../dgit:7532 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7533 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7552 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -2700,7 +2705,7 @@ msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" msgid "No ffq-prev to stitch." msgstr "Geen ffq-prev om te borduren." -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2711,35 +2716,35 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef toeleveraar-commitish expliciet op." -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "fout versienummer `%s'" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "toeleveraarsstuk `%s'" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "van de toeleveraar (belangrijkste stuk" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" "oud anker werd herkend omwille van --anchor, kan niet controleren bij " "toeleveraar" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " @@ -2749,14 +2754,14 @@ msgstr "" "(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " "stuk plus misschien een eerdere combinatie)" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" "eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet " "`.'" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " @@ -2765,118 +2770,118 @@ msgstr "" "vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-" "combine'-vastlegging" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt ingevoerd" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt weggelaten" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "niet lineair (fast forward): %s %s" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "Vorige head reeds opgenomen\n" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "Niet in staat te behouden: %s" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "geen argumenten toegelaten" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "tak bevat stoffering (niet gewassen)" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "tak is ongewassen (unlaundered)" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "tak heeft wasbeurt nodig" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "tak is niet in git-debrebase-indeling" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr " tak is gewassen\n" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr " %s is niet goed gedefinieerd\n" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "kern-git-debrebase-vastleggingen:\n" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "anker" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "golfbreker (breakwater)" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr " borduursel losgemaakt; vorige tip was:\n" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr " geborduurd\n" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "u bent momenteel aan het rebasen\n" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "wassen voor git-debrebase quick" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "Geen lopende git-debrebase-sessie." -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "Geen (andere) patches die geëxporteerd moeten worden." -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " @@ -2885,39 +2890,39 @@ msgstr "" "De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " "gestaakt). Probeer eerst een wasbeurt te doen." -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "%s bevat commentaar die verwijderd zal worden" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "patch %s herhaald in %s !" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 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:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2929,12 +2934,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2944,47 +2949,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 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:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, 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:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2995,14 +3000,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:2674 +#: ../git-debrebase:2678 #, 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:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -3013,17 +3018,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -3034,58 +3039,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:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 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:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, 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:2821 +#: ../git-debrebase:2825 #, 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:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -3096,31 +3101,31 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, 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:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" @@ -3272,6 +3277,3 @@ msgstr "mkdir van de speelplaats %s mislukte: %s" #~ msgid "import %s requires .../%s, but it does not exist" #~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" - -#~ msgid "import %s requires %s, but: %s" -#~ msgstr "importeren van %s vereist %s, maar: %s" -- cgit v1.2.3