diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-09-06 23:47:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-09-06 23:47:47 +0100 |
commit | 66e7cb5758160a04d63831dc7dd19e0d55816650 (patch) | |
tree | ae48afd292dcd929fc3739f1544dda3f6393e139 | |
parent | 11d37018478b444892c38cf072b3ddd07256793a (diff) |
i18n-commit - autogenerated
-rw-r--r-- | po/en_US.po | 735 | ||||
-rw-r--r-- | po/messages.pot | 735 | ||||
-rw-r--r-- | po/nl.po | 735 | ||||
-rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 14 | ||||
-rw-r--r-- | po4a/dgit-maint-merge_7.pot | 14 | ||||
-rw-r--r-- | po4a/dgit_1.pot | 502 | ||||
-rw-r--r-- | po4a/git-debrebase_5.pot | 6 |
7 files changed, 1401 insertions, 1340 deletions
diff --git a/po/en_US.po b/po/en_US.po index bd4bc79..cd157b5 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-08-10 18:42+0000\n" +"POT-Creation-Date: 2019-09-06 22:47+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:265 +#: ../dgit:267 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:272 +#: ../dgit:274 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:280 +#: ../dgit:282 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:285 +#: ../dgit:287 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:517 +#: ../dgit:519 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:522 ../dgit:528 +#: ../dgit:524 ../dgit:530 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:523 +#: ../dgit:525 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:531 +#: ../dgit:533 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:538 +#: ../dgit:540 msgid "protocol message" msgstr "" -#: ../dgit:546 +#: ../dgit:548 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:567 +#: ../dgit:569 msgid "bad byte count" msgstr "" -#: ../dgit:570 +#: ../dgit:572 msgid "data block" msgstr "" -#: ../dgit:649 +#: ../dgit:651 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:651 +#: ../dgit:653 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:676 +#: ../dgit:678 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:695 +#: ../dgit:697 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:699 +#: ../dgit:701 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:704 +#: ../dgit:706 msgid "too few arguments" msgstr "" -#: ../dgit:820 +#: ../dgit:822 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:823 +#: ../dgit:825 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:843 +#: ../dgit:845 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:884 +#: ../dgit:902 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:899 +#: ../dgit:917 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:915 +#: ../dgit:933 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:935 +#: ../dgit:953 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:953 +#: ../dgit:971 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 +#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "" -#: ../dgit:960 +#: ../dgit:978 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:964 +#: ../dgit:982 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:987 +#: ../dgit:1005 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1150 +#: ../dgit:1168 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1217 +#: ../dgit:1236 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1224 +#: ../dgit:1243 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1245 +#: ../dgit:1264 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1263 +#: ../dgit:1282 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1267 +#: ../dgit:1286 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1269 +#: ../dgit:1288 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1271 +#: ../dgit:1290 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1273 ../dgit:1298 +#: ../dgit:1292 ../dgit:1317 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1287 +#: ../dgit:1306 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1308 msgid "bad component" msgstr "" -#: ../dgit:1292 +#: ../dgit:1311 msgid "bad filename" msgstr "" -#: ../dgit:1294 +#: ../dgit:1313 msgid "bad sha256sum" msgstr "" -#: ../dgit:1345 +#: ../dgit:1364 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1429 +#: ../dgit:1448 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1453 +#: ../dgit:1472 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1479 +#: ../dgit:1498 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1480 +#: ../dgit:1499 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1585 +#: ../dgit:1604 #, 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:1724 +#: ../dgit:1743 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1727 +#: ../dgit:1746 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1748 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1768 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1755 +#: ../dgit:1774 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1782 +#: ../dgit:1801 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1805 +#: ../dgit:1824 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1820 +#: ../dgit:1839 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1857 +#: ../dgit:1876 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1903 +#: ../dgit:1922 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1914 +#: ../dgit:1933 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1960 +#: ../dgit:1979 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1969 +#: ../dgit:1988 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1973 +#: ../dgit:1992 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1979 +#: ../dgit:1998 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2019 +#: ../dgit:2038 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2032 +#: ../dgit:2051 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2045 +#: ../dgit:2064 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2061 +#: ../dgit:2080 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2066 +#: ../dgit:2085 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2074 +#: ../dgit:2093 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2081 +#: ../dgit:2100 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2109 +#: ../dgit:2128 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2117 +#: ../dgit:2136 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2120 +#: ../dgit:2139 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2139 +#: ../dgit:2158 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2162 +#: ../dgit:2181 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2174 +#: ../dgit:2193 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2205 +#: ../dgit:2224 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2207 +#: ../dgit:2226 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2209 +#: ../dgit:2228 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2214 +#: ../dgit:2233 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2239 +#: ../dgit:2258 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2243 +#: ../dgit:2262 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2264 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2248 +#: ../dgit:2267 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2257 +#: ../dgit:2276 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2261 +#: ../dgit:2280 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2264 +#: ../dgit:2283 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2270 +#: ../dgit:2289 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2341 +#: ../dgit:2360 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2403 +#: ../dgit:2422 msgid "package changelog" msgstr "" -#: ../dgit:2443 +#: ../dgit:2462 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2512 ../dgit:2517 +#: ../dgit:2531 ../dgit:2536 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2532 ../dgit:2539 +#: ../dgit:2551 ../dgit:2558 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2565 ../dgit:6037 +#: ../dgit:2584 ../dgit:6070 msgid "source package" msgstr "" -#: ../dgit:2643 +#: ../dgit:2662 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2662 +#: ../dgit:2681 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2671 +#: ../dgit:2690 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2686 +#: ../dgit:2705 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2690 +#: ../dgit:2709 msgid "Import of source package" msgstr "" -#: ../dgit:2710 +#: ../dgit:2729 #, perl-format msgid "" "\n" @@ -547,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2752 +#: ../dgit:2771 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2756 +#: ../dgit:2775 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2760 +#: ../dgit:2779 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2776 +#: ../dgit:2795 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2871 +#: ../dgit:2890 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2886 +#: ../dgit:2905 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2930 +#: ../dgit:2949 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2945 +#: ../dgit:2964 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:2950 +#: ../dgit:2969 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3097 +#: ../dgit:3116 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3102 +#: ../dgit:3121 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3107 +#: ../dgit:3126 #, 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:3117 +#: ../dgit:3136 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3137 +#: ../dgit:3156 msgid "rewrite map" msgstr "" -#: ../dgit:3144 +#: ../dgit:3163 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3148 +#: ../dgit:3167 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3150 +#: ../dgit:3169 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3157 +#: ../dgit:3176 msgid "additional commits" msgstr "" -#: ../dgit:3160 +#: ../dgit:3179 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3185 +#: ../dgit:3204 msgid "last upload to archive" msgstr "" -#: ../dgit:3189 +#: ../dgit:3208 msgid "no version available from the archive" msgstr "" -#: ../dgit:3272 +#: ../dgit:3291 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3279 +#: ../dgit:3298 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3284 +#: ../dgit:3303 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3312 +#: ../dgit:3331 #, perl-format msgid "" "\n" @@ -684,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3325 +#: ../dgit:3344 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3328 +#: ../dgit:3347 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3349 +#: ../dgit:3368 #, perl-format msgid "" "\n" @@ -700,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3358 +#: ../dgit:3377 #, perl-format msgid "" "\n" @@ -710,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3443 +#: ../dgit:3462 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3456 +#: ../dgit:3475 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3474 +#: ../dgit:3493 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3476 +#: ../dgit:3495 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3487 +#: ../dgit:3506 #, perl-format msgid "" "\n" @@ -740,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3502 +#: ../dgit:3521 msgid "fetched source tree" msgstr "" -#: ../dgit:3538 +#: ../dgit:3557 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3603 +#: ../dgit:3622 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3617 +#: ../dgit:3636 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3632 +#: ../dgit:3651 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3659 +#: ../dgit:3678 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3681 +#: ../dgit:3700 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3689 +#: ../dgit:3708 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3728 +#: ../dgit:3747 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3760 +#: ../dgit:3779 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3762 +#: ../dgit:3781 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3801 +#: ../dgit:3820 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3815 +#: ../dgit:3834 msgid "" "\n" "Key\n" @@ -811,257 +811,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3830 +#: ../dgit:3849 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3848 +#: ../dgit:3867 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3866 +#: ../dgit:3885 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3881 +#: ../dgit:3900 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3893 +#: ../dgit:3912 msgid "fetching existing git history" msgstr "" -#: ../dgit:3896 +#: ../dgit:3915 msgid "starting new git history" msgstr "" -#: ../dgit:3921 +#: ../dgit:3940 #, 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:3926 +#: ../dgit:3945 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3938 +#: ../dgit:3957 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3940 +#: ../dgit:3959 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3948 +#: ../dgit:3967 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3959 +#: ../dgit:3978 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:3997 #, 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:3995 +#: ../dgit:4014 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3998 +#: ../dgit:4017 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4002 +#: ../dgit:4021 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4046 +#: ../dgit:4065 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4051 +#: ../dgit:4070 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4061 +#: ../dgit:4080 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4067 +#: ../dgit:4086 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4093 +#: ../dgit:4112 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4096 +#: ../dgit:4115 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4104 +#: ../dgit:4123 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4113 +#: ../dgit:4132 msgid "version currently in archive" msgstr "" -#: ../dgit:4122 +#: ../dgit:4141 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4130 +#: ../dgit:4149 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4141 +#: ../dgit:4160 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4144 +#: ../dgit:4163 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4158 +#: ../dgit:4177 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4214 +#: ../dgit:4233 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4223 +#: ../dgit:4242 msgid "maintainer view tag" msgstr "" -#: ../dgit:4225 +#: ../dgit:4244 msgid "dgit view tag" msgstr "" -#: ../dgit:4226 +#: ../dgit:4245 msgid "current archive contents" msgstr "" -#: ../dgit:4239 +#: ../dgit:4258 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4249 +#: ../dgit:4268 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4250 +#: ../dgit:4269 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4254 +#: ../dgit:4273 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4267 +#: ../dgit:4286 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4275 +#: ../dgit:4294 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4287 +#: ../dgit:4306 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4309 +#: ../dgit:4328 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4363 +#: ../dgit:4382 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5609 +#: ../dgit:5642 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5627 +#: ../dgit:5660 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5636 +#: ../dgit:5669 msgid "root commit" msgstr "" -#: ../dgit:5642 +#: ../dgit:5675 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5654 +#: ../dgit:5687 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5673 +#: ../dgit:5706 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5680 +#: ../dgit:5713 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5692 +#: ../dgit:5725 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5695 +#: ../dgit:5728 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5707 +#: ../dgit:5740 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5714 +#: ../dgit:5747 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5748 +#: ../dgit:5781 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5749 +#: ../dgit:5782 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5750 +#: ../dgit:5783 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5751 +#: ../dgit:5784 msgid "is series file\n" msgstr "" -#: ../dgit:5752 +#: ../dgit:5785 msgid "too long\n" msgstr "" -#: ../dgit:5756 +#: ../dgit:5789 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5785 +#: ../dgit:5818 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5868 +#: ../dgit:5901 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5886 +#: ../dgit:5919 msgid "converted" msgstr "" -#: ../dgit:5887 +#: ../dgit:5920 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5941 +#: ../dgit:5974 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5951 +#: ../dgit:5984 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6061 +#: ../dgit:6094 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6093 +#: ../dgit:6126 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6098 +#: ../dgit:6131 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6133 +#: ../dgit:6166 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6247 +#: ../dgit:6280 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" @@ -1154,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6261 +#: ../dgit:6294 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6295 +#: ../dgit:6328 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6308 +#: ../dgit:6341 msgid "tarball" msgstr "" -#: ../dgit:6326 +#: ../dgit:6359 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6342 +#: ../dgit:6375 msgid "tarballs" msgstr "" -#: ../dgit:6356 +#: ../dgit:6389 msgid "upstream" msgstr "" -#: ../dgit:6380 +#: ../dgit:6413 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6390 +#: ../dgit:6423 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6399 +#: ../dgit:6432 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6403 +#: ../dgit:6436 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6410 +#: ../dgit:6443 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6414 +#: ../dgit:6447 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6417 +#: ../dgit:6450 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6420 +#: ../dgit:6453 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6423 +#: ../dgit:6456 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6427 +#: ../dgit:6460 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6438 +#: ../dgit:6471 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6477 +#: ../dgit:6510 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,124 +1240,137 @@ msgid "" "\n" msgstr "" -#: ../dgit:6489 +#: ../dgit:6522 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6518 +#: ../dgit:6551 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:6530 +#: ../dgit:6563 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6533 +#: ../dgit:6566 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6536 +#: ../dgit:6569 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6549 +#: ../dgit:6582 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6566 +#: ../dgit:6599 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6580 +#: ../dgit:6613 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6599 +#: ../dgit:6632 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6609 +#: ../dgit:6642 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6618 +#: ../dgit:6651 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6622 +#: ../dgit:6655 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6657 +#: ../dgit:6690 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6659 +#: ../dgit:6692 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6685 +#: ../dgit:6710 +#, perl-format +msgid "warning: dgit option %s must be passed before %s on dgit command line\n" +msgstr "" + +#: ../dgit:6717 +#, perl-format +msgid "" +"warning: option %s should probably be passed to dgit before %s sub-command " +"on the dgit command line, so that it is seen by dgit and not simply passed " +"to %s\n" +msgstr "" + +#: ../dgit:6743 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6691 +#: ../dgit:6749 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6694 +#: ../dgit:6752 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6737 +#: ../dgit:6795 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6775 +#: ../dgit:6833 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6782 +#: ../dgit:6840 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6789 +#: ../dgit:6847 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6793 +#: ../dgit:6851 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6798 +#: ../dgit:6856 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6801 +#: ../dgit:6859 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6814 +#: ../dgit:6872 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1365,136 +1378,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6832 +#: ../dgit:6890 msgid "build successful\n" msgstr "" -#: ../dgit:6839 +#: ../dgit:6898 #, 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:6949 +#: ../dgit:7009 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6986 +#: ../dgit:7046 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7006 +#: ../dgit:7066 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7019 +#: ../dgit:7079 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7023 +#: ../dgit:7083 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7030 +#: ../dgit:7090 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7036 +#: ../dgit:7096 msgid "source changes file" msgstr "" -#: ../dgit:7038 +#: ../dgit:7098 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7058 ../dgit:7060 +#: ../dgit:7118 ../dgit:7120 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7073 +#: ../dgit:7134 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:7085 +#: ../dgit:7147 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7089 +#: ../dgit:7151 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:7119 +#: ../dgit:7181 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7140 +#: ../dgit:7202 msgid "source tree" msgstr "" -#: ../dgit:7142 +#: ../dgit:7204 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7155 +#: ../dgit:7217 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7159 +#: ../dgit:7221 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7163 +#: ../dgit:7225 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7180 +#: ../dgit:7242 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7185 +#: ../dgit:7247 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7187 +#: ../dgit:7249 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7198 +#: ../dgit:7260 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7201 +#: ../dgit:7263 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7212 +#: ../dgit:7274 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7223 +#: ../dgit:7285 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7232 +#: ../dgit:7294 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1502,21 +1515,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7239 +#: ../dgit:7301 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7241 +#: ../dgit:7303 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7246 +#: ../dgit:7308 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7251 +#: ../dgit:7313 #, perl-format msgid "" "Branch %s already exists\n" @@ -1524,129 +1537,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7271 +#: ../dgit:7333 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7273 +#: ../dgit:7335 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7281 +#: ../dgit:7343 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7300 +#: ../dgit:7362 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7304 +#: ../dgit:7366 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7305 +#: ../dgit:7367 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7316 +#: ../dgit:7378 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7318 +#: ../dgit:7380 msgid "Import, merging." msgstr "" -#: ../dgit:7332 +#: ../dgit:7394 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7341 +#: ../dgit:7403 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7348 +#: ../dgit:7410 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7366 +#: ../dgit:7428 msgid "need destination argument" msgstr "" -#: ../dgit:7371 +#: ../dgit:7433 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7379 +#: ../dgit:7441 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7390 +#: ../dgit:7452 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7396 +#: ../dgit:7458 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7403 ../dgit:7409 +#: ../dgit:7465 ../dgit:7471 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7415 +#: ../dgit:7477 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7462 +#: ../dgit:7524 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7501 +#: ../dgit:7563 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7505 +#: ../dgit:7567 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7605 +#: ../dgit:7667 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7623 +#: ../dgit:7685 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7678 +#: ../dgit:7740 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7693 +#: ../dgit:7755 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7697 +#: ../dgit:7759 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7703 +#: ../dgit:7765 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1654,35 +1667,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7720 +#: ../dgit:7782 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7733 +#: ../dgit:7795 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7753 +#: ../dgit:7815 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7764 +#: ../dgit:7826 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7792 +#: ../dgit:7854 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7793 +#: ../dgit:7855 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7812 +#: ../dgit:7874 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2364,93 +2377,93 @@ msgstr "" msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:296 +#: ../Debian/Dgit.pm:298 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:322 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:341 +#: ../Debian/Dgit.pm:343 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:345 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:346 +#: ../Debian/Dgit.pm:348 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:350 +#: ../Debian/Dgit.pm:352 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:356 +#: ../Debian/Dgit.pm:358 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:362 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:366 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:368 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:457 +#: ../Debian/Dgit.pm:459 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:467 +#: ../Debian/Dgit.pm:469 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:486 +#: ../Debian/Dgit.pm:488 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:492 +#: ../Debian/Dgit.pm:494 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:515 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:516 +#: ../Debian/Dgit.pm:518 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:624 +#: ../Debian/Dgit.pm:626 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:625 +#: ../Debian/Dgit.pm:627 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:647 +#: ../Debian/Dgit.pm:649 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:653 +#: ../Debian/Dgit.pm:655 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2458,66 +2471,66 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 +#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:767 +#: ../Debian/Dgit.pm:769 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:768 +#: ../Debian/Dgit.pm:770 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:784 +#: ../Debian/Dgit.pm:786 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:793 +#: ../Debian/Dgit.pm:795 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:807 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:828 +#: ../Debian/Dgit.pm:830 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:914 +#: ../Debian/Dgit.pm:916 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:935 +#: ../Debian/Dgit.pm:937 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1003 +#: ../Debian/Dgit.pm:1005 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1026 +#: ../Debian/Dgit.pm:1028 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1034 +#: ../Debian/Dgit.pm:1036 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1043 +#: ../Debian/Dgit.pm:1045 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index ee453df..20337c8 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-10 18:42+0000\n" +"POT-Creation-Date: 2019-09-06 22:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:265 +#: ../dgit:267 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:272 +#: ../dgit:274 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:280 +#: ../dgit:282 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:285 +#: ../dgit:287 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:517 +#: ../dgit:519 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:522 ../dgit:528 +#: ../dgit:524 ../dgit:530 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:523 +#: ../dgit:525 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:531 +#: ../dgit:533 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:538 +#: ../dgit:540 msgid "protocol message" msgstr "" -#: ../dgit:546 +#: ../dgit:548 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:567 +#: ../dgit:569 msgid "bad byte count" msgstr "" -#: ../dgit:570 +#: ../dgit:572 msgid "data block" msgstr "" -#: ../dgit:649 +#: ../dgit:651 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:651 +#: ../dgit:653 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:676 +#: ../dgit:678 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:695 +#: ../dgit:697 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:699 +#: ../dgit:701 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:704 +#: ../dgit:706 msgid "too few arguments" msgstr "" -#: ../dgit:820 +#: ../dgit:822 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:823 +#: ../dgit:825 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:843 +#: ../dgit:845 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:884 +#: ../dgit:902 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:899 +#: ../dgit:917 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:915 +#: ../dgit:933 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:935 +#: ../dgit:953 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:953 +#: ../dgit:971 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 +#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "" -#: ../dgit:960 +#: ../dgit:978 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:964 +#: ../dgit:982 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:987 +#: ../dgit:1005 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1150 +#: ../dgit:1168 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1217 +#: ../dgit:1236 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1224 +#: ../dgit:1243 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1245 +#: ../dgit:1264 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1263 +#: ../dgit:1282 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1267 +#: ../dgit:1286 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1269 +#: ../dgit:1288 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1271 +#: ../dgit:1290 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1273 ../dgit:1298 +#: ../dgit:1292 ../dgit:1317 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1287 +#: ../dgit:1306 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1308 msgid "bad component" msgstr "" -#: ../dgit:1292 +#: ../dgit:1311 msgid "bad filename" msgstr "" -#: ../dgit:1294 +#: ../dgit:1313 msgid "bad sha256sum" msgstr "" -#: ../dgit:1345 +#: ../dgit:1364 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1429 +#: ../dgit:1448 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1453 +#: ../dgit:1472 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1479 +#: ../dgit:1498 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1480 +#: ../dgit:1499 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1585 +#: ../dgit:1604 #, 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:1724 +#: ../dgit:1743 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1727 +#: ../dgit:1746 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1748 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1768 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1755 +#: ../dgit:1774 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1782 +#: ../dgit:1801 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1805 +#: ../dgit:1824 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1820 +#: ../dgit:1839 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1857 +#: ../dgit:1876 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1903 +#: ../dgit:1922 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1914 +#: ../dgit:1933 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1960 +#: ../dgit:1979 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1969 +#: ../dgit:1988 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1973 +#: ../dgit:1992 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1979 +#: ../dgit:1998 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2019 +#: ../dgit:2038 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2032 +#: ../dgit:2051 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2045 +#: ../dgit:2064 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2061 +#: ../dgit:2080 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2066 +#: ../dgit:2085 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2074 +#: ../dgit:2093 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2081 +#: ../dgit:2100 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2109 +#: ../dgit:2128 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2117 +#: ../dgit:2136 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2120 +#: ../dgit:2139 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2139 +#: ../dgit:2158 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2162 +#: ../dgit:2181 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2174 +#: ../dgit:2193 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2205 +#: ../dgit:2224 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2207 +#: ../dgit:2226 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2209 +#: ../dgit:2228 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2214 +#: ../dgit:2233 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2239 +#: ../dgit:2258 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2243 +#: ../dgit:2262 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2264 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2248 +#: ../dgit:2267 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2257 +#: ../dgit:2276 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2261 +#: ../dgit:2280 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2264 +#: ../dgit:2283 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2270 +#: ../dgit:2289 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2341 +#: ../dgit:2360 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2403 +#: ../dgit:2422 msgid "package changelog" msgstr "" -#: ../dgit:2443 +#: ../dgit:2462 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2512 ../dgit:2517 +#: ../dgit:2531 ../dgit:2536 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2532 ../dgit:2539 +#: ../dgit:2551 ../dgit:2558 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2565 ../dgit:6037 +#: ../dgit:2584 ../dgit:6070 msgid "source package" msgstr "" -#: ../dgit:2643 +#: ../dgit:2662 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2662 +#: ../dgit:2681 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2671 +#: ../dgit:2690 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2686 +#: ../dgit:2705 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2690 +#: ../dgit:2709 msgid "Import of source package" msgstr "" -#: ../dgit:2710 +#: ../dgit:2729 #, perl-format msgid "" "\n" @@ -547,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2752 +#: ../dgit:2771 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2756 +#: ../dgit:2775 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2760 +#: ../dgit:2779 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2776 +#: ../dgit:2795 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2871 +#: ../dgit:2890 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2886 +#: ../dgit:2905 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2930 +#: ../dgit:2949 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2945 +#: ../dgit:2964 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:2950 +#: ../dgit:2969 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3097 +#: ../dgit:3116 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3102 +#: ../dgit:3121 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3107 +#: ../dgit:3126 #, 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:3117 +#: ../dgit:3136 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3137 +#: ../dgit:3156 msgid "rewrite map" msgstr "" -#: ../dgit:3144 +#: ../dgit:3163 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3148 +#: ../dgit:3167 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3150 +#: ../dgit:3169 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3157 +#: ../dgit:3176 msgid "additional commits" msgstr "" -#: ../dgit:3160 +#: ../dgit:3179 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3185 +#: ../dgit:3204 msgid "last upload to archive" msgstr "" -#: ../dgit:3189 +#: ../dgit:3208 msgid "no version available from the archive" msgstr "" -#: ../dgit:3272 +#: ../dgit:3291 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3279 +#: ../dgit:3298 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3284 +#: ../dgit:3303 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3312 +#: ../dgit:3331 #, perl-format msgid "" "\n" @@ -684,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3325 +#: ../dgit:3344 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3328 +#: ../dgit:3347 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3349 +#: ../dgit:3368 #, perl-format msgid "" "\n" @@ -700,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3358 +#: ../dgit:3377 #, perl-format msgid "" "\n" @@ -710,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3443 +#: ../dgit:3462 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3456 +#: ../dgit:3475 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3474 +#: ../dgit:3493 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3476 +#: ../dgit:3495 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3487 +#: ../dgit:3506 #, perl-format msgid "" "\n" @@ -740,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3502 +#: ../dgit:3521 msgid "fetched source tree" msgstr "" -#: ../dgit:3538 +#: ../dgit:3557 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3603 +#: ../dgit:3622 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3617 +#: ../dgit:3636 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3632 +#: ../dgit:3651 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3659 +#: ../dgit:3678 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3681 +#: ../dgit:3700 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3689 +#: ../dgit:3708 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3728 +#: ../dgit:3747 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3760 +#: ../dgit:3779 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3762 +#: ../dgit:3781 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3801 +#: ../dgit:3820 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3815 +#: ../dgit:3834 msgid "" "\n" "Key\n" @@ -811,257 +811,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3830 +#: ../dgit:3849 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3848 +#: ../dgit:3867 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3866 +#: ../dgit:3885 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3881 +#: ../dgit:3900 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3893 +#: ../dgit:3912 msgid "fetching existing git history" msgstr "" -#: ../dgit:3896 +#: ../dgit:3915 msgid "starting new git history" msgstr "" -#: ../dgit:3921 +#: ../dgit:3940 #, 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:3926 +#: ../dgit:3945 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3938 +#: ../dgit:3957 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3940 +#: ../dgit:3959 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3948 +#: ../dgit:3967 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3959 +#: ../dgit:3978 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:3997 #, 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:3995 +#: ../dgit:4014 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3998 +#: ../dgit:4017 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4002 +#: ../dgit:4021 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4046 +#: ../dgit:4065 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4051 +#: ../dgit:4070 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4061 +#: ../dgit:4080 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4067 +#: ../dgit:4086 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4093 +#: ../dgit:4112 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4096 +#: ../dgit:4115 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4104 +#: ../dgit:4123 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4113 +#: ../dgit:4132 msgid "version currently in archive" msgstr "" -#: ../dgit:4122 +#: ../dgit:4141 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4130 +#: ../dgit:4149 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4141 +#: ../dgit:4160 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4144 +#: ../dgit:4163 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4158 +#: ../dgit:4177 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4214 +#: ../dgit:4233 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4223 +#: ../dgit:4242 msgid "maintainer view tag" msgstr "" -#: ../dgit:4225 +#: ../dgit:4244 msgid "dgit view tag" msgstr "" -#: ../dgit:4226 +#: ../dgit:4245 msgid "current archive contents" msgstr "" -#: ../dgit:4239 +#: ../dgit:4258 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4249 +#: ../dgit:4268 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4250 +#: ../dgit:4269 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4254 +#: ../dgit:4273 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4267 +#: ../dgit:4286 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4275 +#: ../dgit:4294 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4287 +#: ../dgit:4306 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4309 +#: ../dgit:4328 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4363 +#: ../dgit:4382 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5609 +#: ../dgit:5642 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5627 +#: ../dgit:5660 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5636 +#: ../dgit:5669 msgid "root commit" msgstr "" -#: ../dgit:5642 +#: ../dgit:5675 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5654 +#: ../dgit:5687 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5673 +#: ../dgit:5706 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5680 +#: ../dgit:5713 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5692 +#: ../dgit:5725 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5695 +#: ../dgit:5728 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5707 +#: ../dgit:5740 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5714 +#: ../dgit:5747 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5748 +#: ../dgit:5781 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5749 +#: ../dgit:5782 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5750 +#: ../dgit:5783 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5751 +#: ../dgit:5784 msgid "is series file\n" msgstr "" -#: ../dgit:5752 +#: ../dgit:5785 msgid "too long\n" msgstr "" -#: ../dgit:5756 +#: ../dgit:5789 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5785 +#: ../dgit:5818 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5868 +#: ../dgit:5901 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5886 +#: ../dgit:5919 msgid "converted" msgstr "" -#: ../dgit:5887 +#: ../dgit:5920 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5941 +#: ../dgit:5974 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5951 +#: ../dgit:5984 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6061 +#: ../dgit:6094 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6093 +#: ../dgit:6126 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6098 +#: ../dgit:6131 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6133 +#: ../dgit:6166 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6247 +#: ../dgit:6280 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" @@ -1154,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6261 +#: ../dgit:6294 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6295 +#: ../dgit:6328 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6308 +#: ../dgit:6341 msgid "tarball" msgstr "" -#: ../dgit:6326 +#: ../dgit:6359 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6342 +#: ../dgit:6375 msgid "tarballs" msgstr "" -#: ../dgit:6356 +#: ../dgit:6389 msgid "upstream" msgstr "" -#: ../dgit:6380 +#: ../dgit:6413 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6390 +#: ../dgit:6423 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6399 +#: ../dgit:6432 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6403 +#: ../dgit:6436 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6410 +#: ../dgit:6443 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6414 +#: ../dgit:6447 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6417 +#: ../dgit:6450 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6420 +#: ../dgit:6453 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6423 +#: ../dgit:6456 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6427 +#: ../dgit:6460 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6438 +#: ../dgit:6471 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6477 +#: ../dgit:6510 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,124 +1240,137 @@ msgid "" "\n" msgstr "" -#: ../dgit:6489 +#: ../dgit:6522 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6518 +#: ../dgit:6551 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:6530 +#: ../dgit:6563 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6533 +#: ../dgit:6566 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6536 +#: ../dgit:6569 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6549 +#: ../dgit:6582 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6566 +#: ../dgit:6599 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6580 +#: ../dgit:6613 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6599 +#: ../dgit:6632 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6609 +#: ../dgit:6642 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6618 +#: ../dgit:6651 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6622 +#: ../dgit:6655 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6657 +#: ../dgit:6690 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6659 +#: ../dgit:6692 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6685 +#: ../dgit:6710 +#, perl-format +msgid "warning: dgit option %s must be passed before %s on dgit command line\n" +msgstr "" + +#: ../dgit:6717 +#, perl-format +msgid "" +"warning: option %s should probably be passed to dgit before %s sub-command " +"on the dgit command line, so that it is seen by dgit and not simply passed " +"to %s\n" +msgstr "" + +#: ../dgit:6743 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6691 +#: ../dgit:6749 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6694 +#: ../dgit:6752 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6737 +#: ../dgit:6795 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6775 +#: ../dgit:6833 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6782 +#: ../dgit:6840 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6789 +#: ../dgit:6847 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6793 +#: ../dgit:6851 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6798 +#: ../dgit:6856 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6801 +#: ../dgit:6859 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6814 +#: ../dgit:6872 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1365,136 +1378,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6832 +#: ../dgit:6890 msgid "build successful\n" msgstr "" -#: ../dgit:6839 +#: ../dgit:6898 #, 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:6949 +#: ../dgit:7009 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6986 +#: ../dgit:7046 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7006 +#: ../dgit:7066 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7019 +#: ../dgit:7079 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7023 +#: ../dgit:7083 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7030 +#: ../dgit:7090 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7036 +#: ../dgit:7096 msgid "source changes file" msgstr "" -#: ../dgit:7038 +#: ../dgit:7098 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7058 ../dgit:7060 +#: ../dgit:7118 ../dgit:7120 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7073 +#: ../dgit:7134 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:7085 +#: ../dgit:7147 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7089 +#: ../dgit:7151 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:7119 +#: ../dgit:7181 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7140 +#: ../dgit:7202 msgid "source tree" msgstr "" -#: ../dgit:7142 +#: ../dgit:7204 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7155 +#: ../dgit:7217 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7159 +#: ../dgit:7221 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7163 +#: ../dgit:7225 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7180 +#: ../dgit:7242 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7185 +#: ../dgit:7247 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7187 +#: ../dgit:7249 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7198 +#: ../dgit:7260 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7201 +#: ../dgit:7263 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7212 +#: ../dgit:7274 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7223 +#: ../dgit:7285 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7232 +#: ../dgit:7294 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1502,21 +1515,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7239 +#: ../dgit:7301 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7241 +#: ../dgit:7303 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7246 +#: ../dgit:7308 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7251 +#: ../dgit:7313 #, perl-format msgid "" "Branch %s already exists\n" @@ -1524,129 +1537,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7271 +#: ../dgit:7333 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7273 +#: ../dgit:7335 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7281 +#: ../dgit:7343 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7300 +#: ../dgit:7362 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7304 +#: ../dgit:7366 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7305 +#: ../dgit:7367 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7316 +#: ../dgit:7378 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7318 +#: ../dgit:7380 msgid "Import, merging." msgstr "" -#: ../dgit:7332 +#: ../dgit:7394 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7341 +#: ../dgit:7403 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7348 +#: ../dgit:7410 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7366 +#: ../dgit:7428 msgid "need destination argument" msgstr "" -#: ../dgit:7371 +#: ../dgit:7433 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7379 +#: ../dgit:7441 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7390 +#: ../dgit:7452 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7396 +#: ../dgit:7458 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7403 ../dgit:7409 +#: ../dgit:7465 ../dgit:7471 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7415 +#: ../dgit:7477 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7462 +#: ../dgit:7524 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7501 +#: ../dgit:7563 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7505 +#: ../dgit:7567 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7605 +#: ../dgit:7667 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7623 +#: ../dgit:7685 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7678 +#: ../dgit:7740 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7693 +#: ../dgit:7755 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7697 +#: ../dgit:7759 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7703 +#: ../dgit:7765 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1654,35 +1667,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7720 +#: ../dgit:7782 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7733 +#: ../dgit:7795 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7753 +#: ../dgit:7815 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7764 +#: ../dgit:7826 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7792 +#: ../dgit:7854 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7793 +#: ../dgit:7855 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7812 +#: ../dgit:7874 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2364,93 +2377,93 @@ msgstr "" msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:296 +#: ../Debian/Dgit.pm:298 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:322 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:341 +#: ../Debian/Dgit.pm:343 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:345 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:346 +#: ../Debian/Dgit.pm:348 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:350 +#: ../Debian/Dgit.pm:352 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:356 +#: ../Debian/Dgit.pm:358 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:362 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:366 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:368 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:457 +#: ../Debian/Dgit.pm:459 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:467 +#: ../Debian/Dgit.pm:469 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:486 +#: ../Debian/Dgit.pm:488 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:492 +#: ../Debian/Dgit.pm:494 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:515 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:516 +#: ../Debian/Dgit.pm:518 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:624 +#: ../Debian/Dgit.pm:626 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:625 +#: ../Debian/Dgit.pm:627 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:647 +#: ../Debian/Dgit.pm:649 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:653 +#: ../Debian/Dgit.pm:655 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2458,66 +2471,66 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 +#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:767 +#: ../Debian/Dgit.pm:769 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:768 +#: ../Debian/Dgit.pm:770 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:784 +#: ../Debian/Dgit.pm:786 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:793 +#: ../Debian/Dgit.pm:795 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:807 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:828 +#: ../Debian/Dgit.pm:830 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:914 +#: ../Debian/Dgit.pm:916 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:935 +#: ../Debian/Dgit.pm:937 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1003 +#: ../Debian/Dgit.pm:1005 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1026 +#: ../Debian/Dgit.pm:1028 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1034 +#: ../Debian/Dgit.pm:1036 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1043 +#: ../Debian/Dgit.pm:1045 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-10 18:42+0000\n" +"POT-Creation-Date: 2019-09-06 22:47+0000\n" "PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -19,74 +19,74 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:265 +#: ../dgit:267 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:272 +#: ../dgit:274 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:280 +#: ../dgit:282 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:285 +#: ../dgit:287 #, 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:517 +#: ../dgit:519 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:522 ../dgit:528 +#: ../dgit:524 ../dgit:530 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:523 +#: ../dgit:525 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:531 +#: ../dgit:533 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:538 +#: ../dgit:540 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:546 +#: ../dgit:548 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:567 +#: ../dgit:569 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:570 +#: ../dgit:572 msgid "data block" msgstr "gegevensblok" -#: ../dgit:649 +#: ../dgit:651 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:651 +#: ../dgit:653 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:676 +#: ../dgit:678 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -126,13 +126,13 @@ msgstr "" " -c<naam>=<waarde> configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:695 +#: ../dgit:697 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:699 +#: ../dgit:701 #, perl-format msgid "" "%s: %s\n" @@ -141,22 +141,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:704 +#: ../dgit:706 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:820 +#: ../dgit:822 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:823 +#: ../dgit:825 #, 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:843 +#: ../dgit:845 #, perl-format msgid "" "need value for one of: %s\n" @@ -165,45 +165,45 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:884 +#: ../dgit:902 #, 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:899 +#: ../dgit:917 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:915 +#: ../dgit:933 #, 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:935 +#: ../dgit:953 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:953 +#: ../dgit:971 #, fuzzy, perl-format #| msgid "unknown %s setting `%s'" msgid "unknown %s `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 +#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "interne fout" -#: ../dgit:960 +#: ../dgit:978 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:964 +#: ../dgit:982 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -212,83 +212,83 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:987 +#: ../dgit:1005 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1150 +#: ../dgit:1168 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:1217 +#: ../dgit:1236 #, fuzzy, perl-format #| msgid "fetch of %s gave HTTP code %s" msgid "fetch of %s failed (%s): %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1224 +#: ../dgit:1243 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1245 +#: ../dgit:1264 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1263 +#: ../dgit:1282 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1267 +#: ../dgit:1286 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1269 +#: ../dgit:1288 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1271 +#: ../dgit:1290 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1273 ../dgit:1298 +#: ../dgit:1292 ../dgit:1317 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1287 +#: ../dgit:1306 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1289 +#: ../dgit:1308 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1292 +#: ../dgit:1311 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1294 +#: ../dgit:1313 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1345 +#: ../dgit:1364 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1429 +#: ../dgit:1448 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -301,21 +301,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1453 +#: ../dgit:1472 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1479 +#: ../dgit:1498 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1480 +#: ../dgit:1499 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1585 +#: ../dgit:1604 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -324,134 +324,134 @@ 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:1724 +#: ../dgit:1743 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1727 +#: ../dgit:1746 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1729 +#: ../dgit:1748 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1749 +#: ../dgit:1768 #, 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:1755 +#: ../dgit:1774 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1782 +#: ../dgit:1801 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1805 +#: ../dgit:1824 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1820 +#: ../dgit:1839 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1857 +#: ../dgit:1876 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1903 +#: ../dgit:1922 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1914 +#: ../dgit:1933 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1960 +#: ../dgit:1979 #, 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:1969 +#: ../dgit:1988 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1973 +#: ../dgit:1992 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1979 +#: ../dgit:1998 #, 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:2019 +#: ../dgit:2038 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2032 +#: ../dgit:2051 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2045 +#: ../dgit:2064 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:2061 +#: ../dgit:2080 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2066 +#: ../dgit:2085 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2074 +#: ../dgit:2093 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2081 +#: ../dgit:2100 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2109 +#: ../dgit:2128 #, 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:2117 +#: ../dgit:2136 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2120 +#: ../dgit:2139 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2139 +#: ../dgit:2158 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -460,7 +460,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2162 +#: ../dgit:2181 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -487,7 +487,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2174 +#: ../dgit:2193 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -495,24 +495,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2205 +#: ../dgit:2224 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2207 +#: ../dgit:2226 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2209 +#: ../dgit:2228 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2214 +#: ../dgit:2233 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2239 +#: ../dgit:2258 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -520,80 +520,80 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2243 +#: ../dgit:2262 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2245 +#: ../dgit:2264 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2248 +#: ../dgit:2267 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2257 +#: ../dgit:2276 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2261 +#: ../dgit:2280 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2264 +#: ../dgit:2283 #, 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:2270 +#: ../dgit:2289 #, 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:2341 +#: ../dgit:2360 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2403 +#: ../dgit:2422 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2443 +#: ../dgit:2462 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2512 ../dgit:2517 +#: ../dgit:2531 ../dgit:2536 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2532 ../dgit:2539 +#: ../dgit:2551 ../dgit:2558 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2565 ../dgit:6037 +#: ../dgit:2584 ../dgit:6070 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2643 +#: ../dgit:2662 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2662 +#: ../dgit:2681 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2671 +#: ../dgit:2690 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -606,16 +606,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2686 +#: ../dgit:2705 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2690 +#: ../dgit:2709 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2710 +#: ../dgit:2729 #, perl-format msgid "" "\n" @@ -628,12 +628,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2752 +#: ../dgit:2771 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2756 +#: ../dgit:2775 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -642,12 +642,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2760 +#: ../dgit:2779 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2776 +#: ../dgit:2795 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -655,24 +655,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2871 +#: ../dgit:2890 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2886 +#: ../dgit:2905 #, 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:2930 +#: ../dgit:2949 #, 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:2945 +#: ../dgit:2964 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" @@ -682,7 +682,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:2950 +#: ../dgit:2969 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -698,19 +698,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:3097 +#: ../dgit:3116 #, 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:3102 +#: ../dgit:3121 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3107 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -719,7 +719,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:3117 +#: ../dgit:3136 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -732,30 +732,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:3137 +#: ../dgit:3156 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3144 +#: ../dgit:3163 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:3148 +#: ../dgit:3167 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3150 +#: ../dgit:3169 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:3157 +#: ../dgit:3176 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3160 +#: ../dgit:3179 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -764,27 +764,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3185 +#: ../dgit:3204 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3189 +#: ../dgit:3208 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3272 +#: ../dgit:3291 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3279 +#: ../dgit:3298 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3284 +#: ../dgit:3303 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3312 +#: ../dgit:3331 #, perl-format msgid "" "\n" @@ -800,15 +800,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3325 +#: ../dgit:3344 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3328 +#: ../dgit:3347 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3349 +#: ../dgit:3368 #, perl-format msgid "" "\n" @@ -820,7 +820,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3358 +#: ../dgit:3377 #, perl-format msgid "" "\n" @@ -835,7 +835,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3443 +#: ../dgit:3462 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -846,19 +846,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3456 +#: ../dgit:3475 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3474 +#: ../dgit:3493 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3476 +#: ../dgit:3495 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3487 +#: ../dgit:3506 #, perl-format msgid "" "\n" @@ -874,15 +874,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3502 +#: ../dgit:3521 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3538 +#: ../dgit:3557 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3603 +#: ../dgit:3622 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -890,16 +890,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3617 +#: ../dgit:3636 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:3632 +#: ../dgit:3651 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3659 +#: ../dgit:3678 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -910,32 +910,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3681 +#: ../dgit:3700 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3689 +#: ../dgit:3708 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3728 +#: ../dgit:3747 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3760 +#: ../dgit:3779 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3762 +#: ../dgit:3781 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:3801 +#: ../dgit:3820 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -946,7 +946,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3815 +#: ../dgit:3834 msgid "" "\n" "Key\n" @@ -960,34 +960,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3830 +#: ../dgit:3849 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3848 +#: ../dgit:3867 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3866 +#: ../dgit:3885 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3881 +#: ../dgit:3900 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3893 +#: ../dgit:3912 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3896 +#: ../dgit:3915 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3921 +#: ../dgit:3940 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -997,33 +997,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3926 +#: ../dgit:3945 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3938 +#: ../dgit:3957 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3940 +#: ../dgit:3959 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3948 +#: ../dgit:3967 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3959 +#: ../dgit:3978 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:3978 +#: ../dgit:3997 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1032,15 +1032,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:3995 +#: ../dgit:4014 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3998 +#: ../dgit:4017 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:4002 +#: ../dgit:4021 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1048,7 +1048,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4046 +#: ../dgit:4065 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1056,60 +1056,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4051 +#: ../dgit:4070 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4061 +#: ../dgit:4080 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4067 +#: ../dgit:4086 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4093 +#: ../dgit:4112 #, 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:4096 +#: ../dgit:4115 #, 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:4104 +#: ../dgit:4123 #, 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:4113 +#: ../dgit:4132 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4122 +#: ../dgit:4141 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4130 +#: ../dgit:4149 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4141 +#: ../dgit:4160 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4144 +#: ../dgit:4163 #, perl-format msgid "" "%s is %s\n" @@ -1118,99 +1118,99 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4158 +#: ../dgit:4177 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4214 +#: ../dgit:4233 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4223 +#: ../dgit:4242 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4225 +#: ../dgit:4244 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4226 +#: ../dgit:4245 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4239 +#: ../dgit:4258 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:4249 +#: ../dgit:4268 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4250 +#: ../dgit:4269 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4254 +#: ../dgit:4273 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4267 +#: ../dgit:4286 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4275 +#: ../dgit:4294 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4287 +#: ../dgit:4306 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4309 +#: ../dgit:4328 #, 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:4363 +#: ../dgit:4382 #, 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:5609 +#: ../dgit:5642 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5627 +#: ../dgit:5660 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5636 +#: ../dgit:5669 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5642 +#: ../dgit:5675 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5654 +#: ../dgit:5687 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5673 +#: ../dgit:5706 #, perl-format msgid "" "\n" @@ -1219,23 +1219,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5680 +#: ../dgit:5713 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5692 +#: ../dgit:5725 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:5695 +#: ../dgit:5728 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5707 +#: ../dgit:5740 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1246,88 +1246,88 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5714 +#: ../dgit:5747 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5748 +#: ../dgit:5781 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5749 +#: ../dgit:5782 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5750 +#: ../dgit:5783 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5751 +#: ../dgit:5784 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5752 +#: ../dgit:5785 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5756 +#: ../dgit:5789 #, 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:5785 +#: ../dgit:5818 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5868 +#: ../dgit:5901 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5886 +#: ../dgit:5919 msgid "converted" msgstr "omgezet" -#: ../dgit:5887 +#: ../dgit:5920 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5941 +#: ../dgit:5974 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5951 +#: ../dgit:5984 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6061 +#: ../dgit:6094 #, 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:6093 +#: ../dgit:6126 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6098 +#: ../dgit:6131 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6133 +#: ../dgit:6166 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6247 +#: ../dgit:6280 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" @@ -1341,37 +1341,37 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6261 +#: ../dgit:6294 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6295 +#: ../dgit:6328 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6308 +#: ../dgit:6341 msgid "tarball" msgstr "" -#: ../dgit:6326 +#: ../dgit:6359 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6342 +#: ../dgit:6375 msgid "tarballs" msgstr "" -#: ../dgit:6356 +#: ../dgit:6389 msgid "upstream" msgstr "" -#: ../dgit:6380 +#: ../dgit:6413 #, 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:6390 +#: ../dgit:6423 #, fuzzy, perl-format #| msgid "" #| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1383,54 +1383,54 @@ 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:6399 +#: ../dgit:6432 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6403 +#: ../dgit:6436 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:6410 +#: ../dgit:6443 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6414 +#: ../dgit:6447 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6417 +#: ../dgit:6450 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6420 +#: ../dgit:6453 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:6423 +#: ../dgit:6456 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6427 +#: ../dgit:6460 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:6438 +#: ../dgit:6471 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6477 +#: ../dgit:6510 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1445,13 +1445,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6489 +#: ../dgit:6522 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:6518 +#: ../dgit:6551 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" @@ -1463,18 +1463,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6530 +#: ../dgit:6563 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6533 +#: ../dgit:6566 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:6536 +#: ../dgit:6569 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1482,29 +1482,29 @@ 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:6549 +#: ../dgit:6582 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6566 +#: ../dgit:6599 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6580 +#: ../dgit:6613 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6599 +#: ../dgit:6632 #, fuzzy, perl-format #| msgid "-p specified %s but changelog specified %s" msgid "-p specified package %s, but changelog says %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:6609 +#: ../dgit:6642 #, fuzzy #| msgid "dgit: --include-dirty is not supported in split view quilt mode" msgid "" @@ -1514,76 +1514,89 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " "weergave" -#: ../dgit:6618 +#: ../dgit:6651 #, fuzzy, perl-format #| msgid "dgit: import-dsc: %s" msgid "dgit: --quilt=%s, %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6622 +#: ../dgit:6655 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6657 +#: ../dgit:6690 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6659 +#: ../dgit:6692 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6685 +#: ../dgit:6710 +#, perl-format +msgid "warning: dgit option %s must be passed before %s on dgit command line\n" +msgstr "" + +#: ../dgit:6717 +#, perl-format +msgid "" +"warning: option %s should probably be passed to dgit before %s sub-command " +"on the dgit command line, so that it is seen by dgit and not simply passed " +"to %s\n" +msgstr "" + +#: ../dgit:6743 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:6691 +#: ../dgit:6749 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6694 +#: ../dgit:6752 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6737 +#: ../dgit:6795 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6775 +#: ../dgit:6833 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6782 +#: ../dgit:6840 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6789 +#: ../dgit:6847 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6793 +#: ../dgit:6851 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6798 +#: ../dgit:6856 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6801 +#: ../dgit:6859 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6814 +#: ../dgit:6872 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1595,11 +1608,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6832 +#: ../dgit:6890 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6839 +#: ../dgit:6898 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1610,30 +1623,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6949 +#: ../dgit:7009 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6986 +#: ../dgit:7046 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7006 +#: ../dgit:7066 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7019 +#: ../dgit:7079 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7023 +#: ../dgit:7083 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7030 +#: ../dgit:7090 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -1641,21 +1654,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7036 +#: ../dgit:7096 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7038 +#: ../dgit:7098 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7058 ../dgit:7060 +#: ../dgit:7118 ../dgit:7120 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7073 +#: ../dgit:7134 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" @@ -1664,7 +1677,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7085 +#: ../dgit:7147 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -1672,7 +1685,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7089 +#: ../dgit:7151 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -1681,65 +1694,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7119 +#: ../dgit:7181 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7140 +#: ../dgit:7202 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7142 +#: ../dgit:7204 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7155 +#: ../dgit:7217 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7159 +#: ../dgit:7221 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7163 +#: ../dgit:7225 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7180 +#: ../dgit:7242 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7185 +#: ../dgit:7247 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7187 +#: ../dgit:7249 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7198 +#: ../dgit:7260 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7201 +#: ../dgit:7263 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7212 +#: ../dgit:7274 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7223 +#: ../dgit:7285 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:7232 +#: ../dgit:7294 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1750,21 +1763,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:7239 +#: ../dgit:7301 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:7241 +#: ../dgit:7303 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:7246 +#: ../dgit:7308 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7251 +#: ../dgit:7313 #, perl-format msgid "" "Branch %s already exists\n" @@ -1776,88 +1789,88 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7271 +#: ../dgit:7333 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7273 +#: ../dgit:7335 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7281 +#: ../dgit:7343 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7300 +#: ../dgit:7362 #, 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:7304 +#: ../dgit:7366 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7305 +#: ../dgit:7367 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7316 +#: ../dgit:7378 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7318 +#: ../dgit:7380 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7332 +#: ../dgit:7394 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7341 +#: ../dgit:7403 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7348 +#: ../dgit:7410 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7366 +#: ../dgit:7428 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7371 +#: ../dgit:7433 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7379 +#: ../dgit:7441 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:7390 +#: ../dgit:7452 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7396 +#: ../dgit:7458 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7403 ../dgit:7409 +#: ../dgit:7465 ../dgit:7471 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7415 +#: ../dgit:7477 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7462 +#: ../dgit:7524 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -1865,42 +1878,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7501 +#: ../dgit:7563 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7505 +#: ../dgit:7567 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7605 +#: ../dgit:7667 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7623 +#: ../dgit:7685 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7678 +#: ../dgit:7740 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7693 +#: ../dgit:7755 #, 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:7697 +#: ../dgit:7759 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7703 +#: ../dgit:7765 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1911,37 +1924,37 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7720 +#: ../dgit:7782 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7733 +#: ../dgit:7795 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7753 +#: ../dgit:7815 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7764 +#: ../dgit:7826 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7792 +#: ../dgit:7854 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7793 +#: ../dgit:7855 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7812 +#: ../dgit:7874 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -2695,70 +2708,70 @@ msgstr "%s: niet gek van -i voor git-rebase" msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" -#: ../Debian/Dgit.pm:296 +#: ../Debian/Dgit.pm:298 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:322 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "getcwd failed: %s\n" msgstr "getcwd mislukte: %s\n" -#: ../Debian/Dgit.pm:341 +#: ../Debian/Dgit.pm:343 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:345 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:346 +#: ../Debian/Dgit.pm:348 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:350 +#: ../Debian/Dgit.pm:352 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:356 +#: ../Debian/Dgit.pm:358 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:362 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:366 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:368 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:457 +#: ../Debian/Dgit.pm:459 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:467 +#: ../Debian/Dgit.pm:469 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:486 +#: ../Debian/Dgit.pm:488 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:492 +#: ../Debian/Dgit.pm:494 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:515 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -2766,26 +2779,26 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:516 +#: ../Debian/Dgit.pm:518 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:624 +#: ../Debian/Dgit.pm:626 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:625 +#: ../Debian/Dgit.pm:627 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:647 +#: ../Debian/Dgit.pm:649 #, fuzzy #| msgid "found mixed upstream/packaging commit" msgid "using specified upstream commitish" msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" -#: ../Debian/Dgit.pm:653 +#: ../Debian/Dgit.pm:655 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2796,25 +2809,25 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef toeleveraar-commitish expliciet op." -#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 +#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:767 +#: ../Debian/Dgit.pm:769 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:768 +#: ../Debian/Dgit.pm:770 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:784 +#: ../Debian/Dgit.pm:786 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:793 +#: ../Debian/Dgit.pm:795 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -2823,41 +2836,41 @@ msgstr "" "controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit " "push het .dsc moet aanpassen en het dan zelf moet ondertekenen" -#: ../Debian/Dgit.pm:807 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:828 +#: ../Debian/Dgit.pm:830 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:914 +#: ../Debian/Dgit.pm:916 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:935 +#: ../Debian/Dgit.pm:937 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:1003 +#: ../Debian/Dgit.pm:1005 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:1026 +#: ../Debian/Dgit.pm:1028 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:1034 +#: ../Debian/Dgit.pm:1036 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:1043 +#: ../Debian/Dgit.pm:1045 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 3c25348..4f1f8aa 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-09-06 23:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,13 +28,13 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:223 +#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:254 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -43,7 +43,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -305,7 +305,7 @@ msgstr "" #: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" -" % git remote update\n" +" % git fetch --all --tags\n" "\n" msgstr "" @@ -383,7 +383,7 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 #: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 -#: ../git-debpush.1.pod:228 +#: ../git-debpush.1.pod:259 msgid "AUTHOR" msgstr "" diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index 129dca5..e79a09c 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-09-06 23:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -46,13 +46,13 @@ msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:223 +#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:254 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -61,7 +61,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -671,7 +671,7 @@ msgstr "" #: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" -" % git remote update\n" +" % git fetch --all --tags\n" "\n" msgstr "" @@ -895,7 +895,7 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 #: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 -#: ../git-debpush.1.pod:228 +#: ../git-debpush.1.pod:259 msgid "AUTHOR" msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 3d6de78..da13ddc 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-08-10 19:42+0100\n" +"POT-Creation-Date: 2019-09-06 23:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1269 +#: ../dgit.1:185 ../dgit.1:1271 msgid "Print a usage summary." msgstr "" @@ -1206,7 +1206,7 @@ msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:637 +#: ../dgit.1:638 msgid "" "The package is or may be new in this suite. Without this, dgit will refuse " "to push. It may (for Debian, will) be unable to access the git history for " @@ -1214,13 +1214,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:637 +#: ../dgit.1:638 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:645 +#: ../dgit.1:646 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1230,7 +1230,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:657 +#: ../dgit.1:658 msgid "" "Note that this does B<not> prevent dgit from cleaning your tree, so if the " "changes in your working tree are in the form of untracked files, those might " @@ -1241,24 +1241,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:657 +#: ../dgit.1:658 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:660 +#: ../dgit.1:661 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:660 +#: ../dgit.1:661 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:671 +#: ../dgit.1:672 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1267,14 +1267,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:678 +#: ../dgit.1:679 msgid "" "It is safer not to specify I<previous-version>, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:682 +#: ../dgit.1:683 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1282,14 +1282,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:688 +#: ../dgit.1:689 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:702 +#: ../dgit.1:703 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1300,7 +1300,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:708 +#: ../dgit.1:709 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1309,7 +1309,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:713 +#: ../dgit.1:714 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1317,18 +1317,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:713 +#: ../dgit.1:714 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:716 +#: ../dgit.1:717 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:726 +#: ../dgit.1:727 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1338,27 +1338,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:731 +#: ../dgit.1:732 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:731 +#: ../dgit.1:732 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:738 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:747 +#: ../dgit.1:748 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1367,7 +1367,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:755 +#: ../dgit.1:756 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1376,13 +1376,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:755 +#: ../dgit.1:756 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:765 +#: ../dgit.1:766 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1391,7 +1391,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:769 +#: ../dgit.1:770 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1399,25 +1399,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:773 +#: ../dgit.1:774 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:777 +#: ../dgit.1:778 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:777 +#: ../dgit.1:778 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:791 +#: ../dgit.1:792 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1429,13 +1429,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:791 +#: ../dgit.1:792 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:797 +#: ../dgit.1:799 msgid "" "Declare that you are deliberately rewinding history. When pushing to " "Debian, use this when you are making a renewed upload of an entirely new " @@ -1444,7 +1444,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:808 +#: ../dgit.1:810 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1454,13 +1454,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:808 +#: ../dgit.1:810 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:817 +#: ../dgit.1:819 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1472,13 +1472,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:817 +#: ../dgit.1:819 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:822 +#: ../dgit.1:824 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1486,13 +1486,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:822 ../git-debpush.1.pod:112 +#: ../dgit.1:824 ../git-debpush.1.pod:112 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:829 +#: ../dgit.1:831 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1500,20 +1500,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:834 +#: ../dgit.1:836 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: =item -#: ../dgit.1:834 ../git-debpush.1.pod:124 +#: ../dgit.1:836 ../git-debpush.1.pod:124 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:843 +#: ../dgit.1:845 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=linear) but if that doesn't seem " @@ -1523,13 +1523,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:843 ../git-debpush.1.pod:118 +#: ../dgit.1:845 ../git-debpush.1.pod:118 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:848 +#: ../dgit.1:850 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1537,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:854 +#: ../dgit.1:856 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1546,13 +1546,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:854 ../git-debpush.1.pod:129 +#: ../dgit.1:856 ../git-debpush.1.pod:129 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:862 +#: ../dgit.1:864 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1561,13 +1561,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:862 +#: ../dgit.1:864 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:867 +#: ../dgit.1:869 msgid "" "Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " "If you use this option and the metadata did in fact need fixing up, dgit " @@ -1575,27 +1575,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:867 +#: ../dgit.1:869 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:874 +#: ../dgit.1:876 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:878 +#: ../dgit.1:880 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:886 +#: ../dgit.1:888 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1604,7 +1604,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:894 +#: ../dgit.1:896 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1612,7 +1612,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:899 +#: ../dgit.1:901 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1620,7 +1620,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:913 +#: ../dgit.1:915 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1632,7 +1632,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:924 +#: ../dgit.1:926 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1643,7 +1643,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:942 +#: ../dgit.1:944 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1657,7 +1657,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:951 +#: ../dgit.1:953 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1669,13 +1669,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:951 +#: ../dgit.1:953 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:962 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1685,7 +1685,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:966 +#: ../dgit.1:968 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1694,7 +1694,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:971 +#: ../dgit.1:973 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1702,20 +1702,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:971 +#: ../dgit.1:973 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:976 +#: ../dgit.1:978 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:984 +#: ../dgit.1:986 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1725,7 +1725,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:990 +#: ../dgit.1:992 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1733,18 +1733,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:993 +#: ../dgit.1:995 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:996 +#: ../dgit.1:998 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1004 +#: ../dgit.1:1006 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1752,20 +1752,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1007 +#: ../dgit.1:1009 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1007 +#: ../dgit.1:1009 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1012 +#: ../dgit.1:1014 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1773,7 +1773,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1021 +#: ../dgit.1:1023 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1781,13 +1781,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1021 +#: ../dgit.1:1023 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1029 +#: ../dgit.1:1031 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1796,13 +1796,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1029 +#: ../dgit.1:1031 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1041 +#: ../dgit.1:1043 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1814,32 +1814,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1044 +#: ../dgit.1:1046 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1044 +#: ../dgit.1:1046 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1048 +#: ../dgit.1:1050 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1051 +#: ../dgit.1:1053 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1062 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1848,85 +1848,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1060 +#: ../dgit.1:1062 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1063 +#: ../dgit.1:1065 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1063 +#: ../dgit.1:1065 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1070 +#: ../dgit.1:1072 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1070 +#: ../dgit.1:1072 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1073 +#: ../dgit.1:1075 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1073 +#: ../dgit.1:1075 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1076 +#: ../dgit.1:1078 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1076 +#: ../dgit.1:1078 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1080 +#: ../dgit.1:1082 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1080 +#: ../dgit.1:1082 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1084 +#: ../dgit.1:1086 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1084 +#: ../dgit.1:1086 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1095 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1936,7 +1936,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1099 +#: ../dgit.1:1101 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1944,30 +1944,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1099 +#: ../dgit.1:1101 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1102 +#: ../dgit.1:1104 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1102 +#: ../dgit.1:1104 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1106 +#: ../dgit.1:1108 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1113 +#: ../dgit.1:1115 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1975,18 +1975,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1117 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1115 +#: ../dgit.1:1117 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1137 +#: ../dgit.1:1139 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1996,7 +1996,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1145 +#: ../dgit.1:1147 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2005,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1150 +#: ../dgit.1:1152 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2013,7 +2013,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1156 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2021,39 +2021,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1156 +#: ../dgit.1:1158 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1164 +#: ../dgit.1:1166 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1164 +#: ../dgit.1:1166 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1170 +#: ../dgit.1:1172 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1175 +#: ../dgit.1:1177 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1182 +#: ../dgit.1:1184 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2061,13 +2061,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1182 +#: ../dgit.1:1184 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1205 +#: ../dgit.1:1207 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2077,14 +2077,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1213 +#: ../dgit.1:1215 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1220 +#: ../dgit.1:1222 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2093,7 +2093,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1231 +#: ../dgit.1:1233 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2103,7 +2103,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1239 +#: ../dgit.1:1241 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2111,7 +2111,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1256 +#: ../dgit.1:1258 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2123,13 +2123,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1256 +#: ../dgit.1:1258 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1266 +#: ../dgit.1:1268 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2140,19 +2140,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1266 +#: ../dgit.1:1268 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1269 +#: ../dgit.1:1271 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1278 +#: ../dgit.1:1280 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2162,13 +2162,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1280 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1286 +#: ../dgit.1:1288 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2177,13 +2177,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1286 +#: ../dgit.1:1288 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1293 +#: ../dgit.1:1295 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2191,26 +2191,41 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1293 +#: ../dgit.1:1295 +#, no-wrap +msgid "B<--force-reusing-version>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1302 +msgid "" +"Carry on even though this involves reusing a version number of a previous " +"push or upload. It is normally best to give different versions different " +"numbers. Some servers (including, usually, the Debian server) will reject " +"attempts to reuse or replace already-pushed versions." +msgstr "" + +#. type: TP +#: ../dgit.1:1302 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1298 +#: ../dgit.1:1307 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1298 +#: ../dgit.1:1307 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1304 +#: ../dgit.1:1313 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2218,13 +2233,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1304 +#: ../dgit.1:1313 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1311 +#: ../dgit.1:1320 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2232,65 +2247,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1311 +#: ../dgit.1:1320 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1316 +#: ../dgit.1:1325 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1316 +#: ../dgit.1:1325 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1329 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1329 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1324 +#: ../dgit.1:1333 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1324 +#: ../dgit.1:1333 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1330 +#: ../dgit.1:1339 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1330 +#: ../dgit.1:1339 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1345 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2298,13 +2313,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1336 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1345 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1342 +#: ../dgit.1:1351 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2312,31 +2327,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1344 +#: ../dgit.1:1353 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1344 +#: ../dgit.1:1353 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1350 +#: ../dgit.1:1359 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1350 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1359 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1355 +#: ../dgit.1:1364 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2344,66 +2359,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1367 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1358 +#: ../dgit.1:1367 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1361 +#: ../dgit.1:1370 msgid "The default distro for an unknown suite." msgstr "" +#. type: Plain text +#: ../dgit.1:1374 +msgid "" +"This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " +"mentions the specified suite." +msgstr "" + #. type: TP -#: ../dgit.1:1361 +#: ../dgit.1:1374 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1364 +#: ../dgit.1:1377 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1364 +#: ../dgit.1:1377 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1369 +#: ../dgit.1:1382 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1369 +#: ../dgit.1:1382 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1373 +#: ../dgit.1:1386 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1373 +#: ../dgit.1:1386 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1379 +#: ../dgit.1:1392 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2411,45 +2433,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1392 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1383 +#: ../dgit.1:1396 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1385 +#: ../dgit.1:1398 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1402 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1396 +#: ../dgit.1:1409 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2458,52 +2480,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1409 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1400 +#: ../dgit.1:1413 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1400 +#: ../dgit.1:1413 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1415 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1405 +#: ../dgit.1:1418 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1405 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1418 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1408 +#: ../dgit.1:1421 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1408 +#: ../dgit.1:1421 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1413 +#: ../dgit.1:1426 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2511,26 +2533,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1426 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1417 +#: ../dgit.1:1430 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1417 +#: ../dgit.1:1430 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1422 +#: ../dgit.1:1435 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2538,13 +2560,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1435 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1441 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2552,24 +2574,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1441 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1434 +#: ../dgit.1:1447 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1434 +#: ../dgit.1:1447 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1446 +#: ../dgit.1:1459 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2579,13 +2601,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1446 +#: ../dgit.1:1459 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1451 +#: ../dgit.1:1464 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2594,204 +2616,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1451 +#: ../dgit.1:1464 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1467 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1454 +#: ../dgit.1:1467 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1457 +#: ../dgit.1:1470 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1457 +#: ../dgit.1:1470 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1463 +#: ../dgit.1:1476 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1463 +#: ../dgit.1:1476 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1465 +#: ../dgit.1:1478 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1467 +#: ../dgit.1:1480 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1469 +#: ../dgit.1:1482 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1484 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1473 +#: ../dgit.1:1486 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1475 +#: ../dgit.1:1488 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1490 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1479 +#: ../dgit.1:1492 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1481 +#: ../dgit.1:1494 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1483 +#: ../dgit.1:1496 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1498 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1502 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1504 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1493 +#: ../dgit.1:1506 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1508 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1510 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1512 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1514 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1503 +#: ../dgit.1:1516 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1518 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1507 +#: ../dgit.1:1520 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1509 +#: ../dgit.1:1522 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1511 +#: ../dgit.1:1524 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1513 +#: ../dgit.1:1526 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1514 +#: ../dgit.1:1527 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1523 +#: ../dgit.1:1536 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2801,26 +2823,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1523 +#: ../dgit.1:1536 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1527 +#: ../dgit.1:1540 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1540 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1532 +#: ../dgit.1:1545 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2828,13 +2850,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1532 +#: ../dgit.1:1545 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1539 +#: ../dgit.1:1552 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2842,7 +2864,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1545 +#: ../dgit.1:1558 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2850,7 +2872,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1550 +#: ../dgit.1:1563 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2859,7 +2881,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1555 +#: ../dgit.1:1568 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2867,7 +2889,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 @@ -2879,13 +2901,13 @@ msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1564 +#: ../dgit.1:1577 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1565 +#: ../dgit.1:1578 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index 91ac1c8..238be6a 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-08-10 19:42+0100\n" +"POT-Creation-Date: 2019-09-06 23:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,7 +28,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 @@ -914,7 +914,7 @@ msgid "" "The full set of annotations is:\n" " [git-debrebase split: mixed commit, debian part]\n" " [git-debrebase split: mixed commit, upstream-part]\n" -" [git-debrebase onvert dgit import: debian changes]\n" +" [git-debrebase convert dgit import: debian changes]\n" " [git-debrebase anchor: convert dgit import, upstream changes]\n" "\n" msgstr "" |