From 9fa199bf326ee2744135c0db8807878815ccbb89 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 19:42:36 +0100 Subject: [PATCH 1/1] i18n-commit - autogenerated --- po/en_US.po | 984 ++++++++++++++++++------------------- po/messages.pot | 984 ++++++++++++++++++------------------- po/nl.po | 1010 +++++++++++++++++++------------------- po4a/dgit_1.pot | 208 ++++---- po4a/git-debrebase_1.pot | 365 +++++++------- po4a/git-debrebase_5.pot | 22 +- 6 files changed, 1787 insertions(+), 1786 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index e8cd03f5..bd4bc79e 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-07-21 00:36+0000\n" +"POT-Creation-Date: 2019-08-10 18:42+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -17,78 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:264 +#: ../dgit:265 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:271 +#: ../dgit:272 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:279 +#: ../dgit:280 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:284 +#: ../dgit:285 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:516 +#: ../dgit:517 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:521 ../dgit:527 +#: ../dgit:522 ../dgit:528 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:522 +#: ../dgit:523 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:530 +#: ../dgit:531 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:537 +#: ../dgit:538 msgid "protocol message" msgstr "" -#: ../dgit:545 +#: ../dgit:546 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:566 +#: ../dgit:567 msgid "bad byte count" msgstr "" -#: ../dgit:569 +#: ../dgit:570 msgid "data block" msgstr "" -#: ../dgit:650 -#, perl-format -msgid "failed to fetch %s: %s" -msgstr "" - -#: ../dgit:662 +#: ../dgit:649 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:664 +#: ../dgit:651 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:689 +#: ../dgit:676 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,153 +104,147 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:708 +#: ../dgit:695 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:712 +#: ../dgit:699 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:717 +#: ../dgit:704 msgid "too few arguments" msgstr "" -#: ../dgit:833 +#: ../dgit:820 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:836 +#: ../dgit:823 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:856 +#: ../dgit:843 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:897 +#: ../dgit:884 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:912 +#: ../dgit:899 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:928 +#: ../dgit:915 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:948 +#: ../dgit:935 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:966 +#: ../dgit:953 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 +#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 msgid "internal error" msgstr "" -#: ../dgit:973 +#: ../dgit:960 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:977 +#: ../dgit:964 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1000 +#: ../dgit:987 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1163 +#: ../dgit:1150 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1209 +#: ../dgit:1217 #, perl-format -msgid "" -"config requested specific TLS key but do not know how to get curl to use " -"exactly that EE key (%s)" +msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1230 -msgid "ftpmasterapi archive query method takes no data part" -msgstr "" - -#: ../dgit:1238 -msgid "curl failed to print 3-digit HTTP code" -msgstr "" - -#: ../dgit:1242 +#: ../dgit:1224 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1258 +#: ../dgit:1245 +msgid "ftpmasterapi archive query method takes no data part" +msgstr "" + +#: ../dgit:1263 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1262 +#: ../dgit:1267 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1264 +#: ../dgit:1269 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1266 +#: ../dgit:1271 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1268 ../dgit:1293 +#: ../dgit:1273 ../dgit:1298 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1282 +#: ../dgit:1287 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1284 +#: ../dgit:1289 msgid "bad component" msgstr "" -#: ../dgit:1287 +#: ../dgit:1292 msgid "bad filename" msgstr "" -#: ../dgit:1289 +#: ../dgit:1294 msgid "bad sha256sum" msgstr "" -#: ../dgit:1340 +#: ../dgit:1345 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1424 +#: ../dgit:1429 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -263,163 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1448 +#: ../dgit:1453 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1474 +#: ../dgit:1479 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1475 +#: ../dgit:1480 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1580 +#: ../dgit:1585 #, 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:1719 +#: ../dgit:1724 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1722 +#: ../dgit:1727 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1724 +#: ../dgit:1729 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1744 +#: ../dgit:1749 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1750 +#: ../dgit:1755 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1777 +#: ../dgit:1782 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1794 -msgid "unexpected results from git check query - " -msgstr "" - -#: ../dgit:1809 +#: ../dgit:1805 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1824 +#: ../dgit:1820 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1861 +#: ../dgit:1857 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1907 +#: ../dgit:1903 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1918 +#: ../dgit:1914 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1964 +#: ../dgit:1960 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1973 +#: ../dgit:1969 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1977 +#: ../dgit:1973 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1983 +#: ../dgit:1979 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2023 +#: ../dgit:2019 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2036 +#: ../dgit:2032 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2049 +#: ../dgit:2045 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2065 +#: ../dgit:2061 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2070 +#: ../dgit:2066 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2078 +#: ../dgit:2074 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2085 +#: ../dgit:2081 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2113 +#: ../dgit:2109 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2121 +#: ../dgit:2117 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2124 +#: ../dgit:2120 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2143 +#: ../dgit:2139 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2166 +#: ../dgit:2162 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -434,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2178 +#: ../dgit:2174 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2209 +#: ../dgit:2205 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2211 +#: ../dgit:2207 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2213 +#: ../dgit:2209 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 +#: ../dgit:2214 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2243 +#: ../dgit:2239 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2247 +#: ../dgit:2243 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2249 +#: ../dgit:2245 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2252 +#: ../dgit:2248 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2261 +#: ../dgit:2257 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2265 +#: ../dgit:2261 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2268 +#: ../dgit:2264 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2274 +#: ../dgit:2270 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2345 +#: ../dgit:2341 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2407 +#: ../dgit:2403 msgid "package changelog" msgstr "" -#: ../dgit:2447 +#: ../dgit:2443 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2516 ../dgit:2521 +#: ../dgit:2512 ../dgit:2517 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2536 ../dgit:2543 +#: ../dgit:2532 ../dgit:2539 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2569 ../dgit:6035 +#: ../dgit:2565 ../dgit:6037 msgid "source package" msgstr "" -#: ../dgit:2647 +#: ../dgit:2643 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2666 +#: ../dgit:2662 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2675 +#: ../dgit:2671 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -544,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2690 +#: ../dgit:2686 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2694 +#: ../dgit:2690 msgid "Import of source package" msgstr "" -#: ../dgit:2714 +#: ../dgit:2710 #, perl-format msgid "" "\n" @@ -562,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2756 +#: ../dgit:2752 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2760 +#: ../dgit:2756 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2764 +#: ../dgit:2760 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2780 +#: ../dgit:2776 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2875 +#: ../dgit:2871 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2890 +#: ../dgit:2886 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2934 +#: ../dgit:2930 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2949 +#: ../dgit:2945 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:2954 +#: ../dgit:2950 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -616,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3101 +#: ../dgit:3097 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3106 +#: ../dgit:3102 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3111 +#: ../dgit:3107 #, 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:3121 +#: ../dgit:3117 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -642,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3141 +#: ../dgit:3137 msgid "rewrite map" msgstr "" -#: ../dgit:3148 +#: ../dgit:3144 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3152 +#: ../dgit:3148 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3154 +#: ../dgit:3150 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3161 +#: ../dgit:3157 msgid "additional commits" msgstr "" -#: ../dgit:3164 +#: ../dgit:3160 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3189 +#: ../dgit:3185 msgid "last upload to archive" msgstr "" -#: ../dgit:3193 +#: ../dgit:3189 msgid "no version available from the archive" msgstr "" -#: ../dgit:3276 +#: ../dgit:3272 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3283 +#: ../dgit:3279 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3288 +#: ../dgit:3284 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3316 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -699,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3329 +#: ../dgit:3325 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3332 +#: ../dgit:3328 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3353 +#: ../dgit:3349 #, perl-format msgid "" "\n" @@ -715,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3362 +#: ../dgit:3358 #, perl-format msgid "" "\n" @@ -725,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3447 +#: ../dgit:3443 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -733,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3460 +#: ../dgit:3456 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3478 +#: ../dgit:3474 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3480 +#: ../dgit:3476 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3491 +#: ../dgit:3487 #, perl-format msgid "" "\n" @@ -755,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3506 +#: ../dgit:3502 msgid "fetched source tree" msgstr "" -#: ../dgit:3542 +#: ../dgit:3538 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3607 +#: ../dgit:3603 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3621 +#: ../dgit:3617 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3636 +#: ../dgit:3632 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3663 +#: ../dgit:3659 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -786,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3685 +#: ../dgit:3681 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3693 +#: ../dgit:3689 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3732 +#: ../dgit:3728 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3764 +#: ../dgit:3760 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3766 +#: ../dgit:3762 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3805 +#: ../dgit:3801 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -817,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3819 +#: ../dgit:3815 msgid "" "\n" "Key\n" @@ -826,30 +811,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3834 +#: ../dgit:3830 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3852 +#: ../dgit:3848 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3860 +#: ../dgit:3866 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3875 +#: ../dgit:3881 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3891 +#: ../dgit:3893 msgid "fetching existing git history" msgstr "" -#: ../dgit:3895 +#: ../dgit:3896 msgid "starting new git history" msgstr "" @@ -905,178 +890,178 @@ msgid "" "\n" msgstr "" -#: ../dgit:4045 +#: ../dgit:4046 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4060 +#: ../dgit:4061 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4066 +#: ../dgit:4067 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4092 +#: ../dgit:4093 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4095 +#: ../dgit:4096 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4103 +#: ../dgit:4104 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4112 +#: ../dgit:4113 msgid "version currently in archive" msgstr "" -#: ../dgit:4121 +#: ../dgit:4122 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4129 +#: ../dgit:4130 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4140 +#: ../dgit:4141 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4143 +#: ../dgit:4144 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4157 +#: ../dgit:4158 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4213 +#: ../dgit:4214 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4222 +#: ../dgit:4223 msgid "maintainer view tag" msgstr "" -#: ../dgit:4224 +#: ../dgit:4225 msgid "dgit view tag" msgstr "" -#: ../dgit:4225 +#: ../dgit:4226 msgid "current archive contents" msgstr "" -#: ../dgit:4238 +#: ../dgit:4239 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4248 +#: ../dgit:4249 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4249 +#: ../dgit:4250 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4253 +#: ../dgit:4254 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4266 +#: ../dgit:4267 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4274 +#: ../dgit:4275 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4286 +#: ../dgit:4287 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4308 +#: ../dgit:4309 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4362 +#: ../dgit:4363 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5607 +#: ../dgit:5609 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5625 +#: ../dgit:5627 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5634 +#: ../dgit:5636 msgid "root commit" msgstr "" -#: ../dgit:5640 +#: ../dgit:5642 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5652 +#: ../dgit:5654 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5671 +#: ../dgit:5673 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5678 +#: ../dgit:5680 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5690 +#: ../dgit:5692 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5693 +#: ../dgit:5695 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5705 +#: ../dgit:5707 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1084,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5712 +#: ../dgit:5714 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5746 +#: ../dgit:5748 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5747 +#: ../dgit:5749 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5748 +#: ../dgit:5750 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5749 +#: ../dgit:5751 msgid "is series file\n" msgstr "" -#: ../dgit:5750 +#: ../dgit:5752 msgid "too long\n" msgstr "" -#: ../dgit:5754 +#: ../dgit:5756 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5783 +#: ../dgit:5785 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5866 +#: ../dgit:5868 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5884 +#: ../dgit:5886 msgid "converted" msgstr "" -#: ../dgit:5885 +#: ../dgit:5887 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5939 +#: ../dgit:5941 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5949 +#: ../dgit:5951 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6059 +#: ../dgit:6061 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6091 +#: ../dgit:6093 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6096 +#: ../dgit:6098 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6131 +#: ../dgit:6133 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6245 +#: ../dgit:6247 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" @@ -1169,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6259 +#: ../dgit:6261 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6293 +#: ../dgit:6295 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6306 +#: ../dgit:6308 msgid "tarball" msgstr "" -#: ../dgit:6324 +#: ../dgit:6326 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6340 +#: ../dgit:6342 msgid "tarballs" msgstr "" -#: ../dgit:6354 +#: ../dgit:6356 msgid "upstream" msgstr "" -#: ../dgit:6378 +#: ../dgit:6380 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6388 +#: ../dgit:6390 #, 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:6397 +#: ../dgit:6399 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6401 +#: ../dgit:6403 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6408 +#: ../dgit:6410 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6412 +#: ../dgit:6414 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6415 +#: ../dgit:6417 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6418 +#: ../dgit:6420 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6421 +#: ../dgit:6423 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6425 +#: ../dgit:6427 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6436 +#: ../dgit:6438 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6475 +#: ../dgit:6477 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1255,124 +1240,124 @@ msgid "" "\n" msgstr "" -#: ../dgit:6487 +#: ../dgit:6489 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6516 +#: ../dgit:6518 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:6528 +#: ../dgit:6530 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6531 +#: ../dgit:6533 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6534 +#: ../dgit:6536 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6547 +#: ../dgit:6549 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6564 +#: ../dgit:6566 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6578 +#: ../dgit:6580 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6597 +#: ../dgit:6599 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6607 +#: ../dgit:6609 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6616 +#: ../dgit:6618 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6620 +#: ../dgit:6622 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6655 +#: ../dgit:6657 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6657 +#: ../dgit:6659 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6683 +#: ../dgit:6685 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6689 +#: ../dgit:6691 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6692 +#: ../dgit:6694 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6735 +#: ../dgit:6737 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6773 +#: ../dgit:6775 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6780 +#: ../dgit:6782 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6787 +#: ../dgit:6789 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6791 +#: ../dgit:6793 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6796 +#: ../dgit:6798 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6799 +#: ../dgit:6801 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6812 +#: ../dgit:6814 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1380,136 +1365,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6830 +#: ../dgit:6832 msgid "build successful\n" msgstr "" -#: ../dgit:6837 +#: ../dgit:6839 #, 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:6947 +#: ../dgit:6949 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6984 +#: ../dgit:6986 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7004 +#: ../dgit:7006 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7017 +#: ../dgit:7019 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7021 +#: ../dgit:7023 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7030 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7034 +#: ../dgit:7036 msgid "source changes file" msgstr "" -#: ../dgit:7036 +#: ../dgit:7038 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7056 ../dgit:7058 +#: ../dgit:7058 ../dgit:7060 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7071 +#: ../dgit:7073 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:7083 +#: ../dgit:7085 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7087 +#: ../dgit:7089 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:7117 +#: ../dgit:7119 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7138 +#: ../dgit:7140 msgid "source tree" msgstr "" -#: ../dgit:7140 +#: ../dgit:7142 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7153 +#: ../dgit:7155 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7157 +#: ../dgit:7159 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7161 +#: ../dgit:7163 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7178 +#: ../dgit:7180 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7183 +#: ../dgit:7185 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7185 +#: ../dgit:7187 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7196 +#: ../dgit:7198 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7199 +#: ../dgit:7201 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7210 +#: ../dgit:7212 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7221 +#: ../dgit:7223 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7230 +#: ../dgit:7232 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1517,21 +1502,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7237 +#: ../dgit:7239 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7239 +#: ../dgit:7241 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7244 +#: ../dgit:7246 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7249 +#: ../dgit:7251 #, perl-format msgid "" "Branch %s already exists\n" @@ -1539,63 +1524,58 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7269 +#: ../dgit:7271 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7271 +#: ../dgit:7273 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7279 +#: ../dgit:7281 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7298 +#: ../dgit:7300 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7302 +#: ../dgit:7304 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7303 +#: ../dgit:7305 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7314 +#: ../dgit:7316 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7316 +#: ../dgit:7318 msgid "Import, merging." msgstr "" -#: ../dgit:7330 +#: ../dgit:7332 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7341 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7346 +#: ../dgit:7348 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7352 -#, perl-format -msgid "exec curl: %s\n" -msgstr "" - #: ../dgit:7366 msgid "need destination argument" msgstr "" @@ -1646,27 +1626,27 @@ msgstr "" msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7620 +#: ../dgit:7623 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7675 +#: ../dgit:7678 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7690 +#: ../dgit:7693 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7694 +#: ../dgit:7697 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7700 +#: ../dgit:7703 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1674,35 +1654,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7717 +#: ../dgit:7720 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7730 +#: ../dgit:7733 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7750 +#: ../dgit:7753 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7761 +#: ../dgit:7764 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7789 +#: ../dgit:7792 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:7793 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7809 +#: ../dgit:7812 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1735,45 +1715,45 @@ msgstr "" msgid "missing required git config %s" msgstr "" -#: ../git-debrebase:364 +#: ../git-debrebase:363 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "" -#: ../git-debrebase:367 +#: ../git-debrebase:366 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "" -#: ../git-debrebase:380 +#: ../git-debrebase:379 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" -#: ../git-debrebase:386 +#: ../git-debrebase:385 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "" -#: ../git-debrebase:390 +#: ../git-debrebase:389 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f, or --force)" msgstr "" -#: ../git-debrebase:422 +#: ../git-debrebase:421 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" msgstr "" -#: ../git-debrebase:429 +#: ../git-debrebase:428 #, perl-format msgid "" "%s\n" "Is this meant to be a gdr branch? %s\n" msgstr "" -#: ../git-debrebase:434 +#: ../git-debrebase:433 #, perl-format msgid "" "%s\n" @@ -1781,7 +1761,7 @@ msgid "" "Consider git-debrebase scrap, to throw away your recent work.\n" msgstr "" -#: ../git-debrebase:440 +#: ../git-debrebase:439 #, perl-format msgid "" "%s\n" @@ -1789,7 +1769,7 @@ msgid "" "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" msgstr "" -#: ../git-debrebase:451 +#: ../git-debrebase:450 #, perl-format msgid "" "%s\n" @@ -1797,415 +1777,415 @@ msgid "" "Maybe you reset to, or rebased from, somewhere inappropriate.\n" msgstr "" -#: ../git-debrebase:898 +#: ../git-debrebase:897 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "" -#: ../git-debrebase:900 +#: ../git-debrebase:899 msgid "has other than two parents" msgstr "" -#: ../git-debrebase:901 +#: ../git-debrebase:900 msgid "contains debian/patches" msgstr "" -#: ../git-debrebase:927 +#: ../git-debrebase:926 msgid "is an origin commit" msgstr "" -#: ../git-debrebase:929 +#: ../git-debrebase:928 msgid "upstream files differ from left parent" msgstr "" -#: ../git-debrebase:931 +#: ../git-debrebase:930 msgid "debian/ differs from right parent" msgstr "" -#: ../git-debrebase:942 +#: ../git-debrebase:941 msgid "edits debian/patches" msgstr "" -#: ../git-debrebase:954 +#: ../git-debrebase:953 msgid "parent's debian is not a directory" msgstr "" -#: ../git-debrebase:961 +#: ../git-debrebase:960 msgid "no changes" msgstr "" -#: ../git-debrebase:967 +#: ../git-debrebase:966 msgid "origin commit" msgstr "" -#: ../git-debrebase:1018 +#: ../git-debrebase:1017 #, perl-format msgid "unknown kind of merge from %s" msgstr "" -#: ../git-debrebase:1021 +#: ../git-debrebase:1020 msgid "octopus merge" msgstr "" -#: ../git-debrebase:1025 +#: ../git-debrebase:1024 msgid "general two-parent merge" msgstr "" -#: ../git-debrebase:1042 +#: ../git-debrebase:1041 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "" -#: ../git-debrebase:1082 +#: ../git-debrebase:1081 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "" -#: ../git-debrebase:1110 +#: ../git-debrebase:1109 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "" -#: ../git-debrebase:1111 +#: ../git-debrebase:1110 #, perl-format msgid " (eg %s)" msgstr "" -#: ../git-debrebase:1117 +#: ../git-debrebase:1116 msgid "found mixed upstream/packaging commit" msgstr "" -#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 -#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 +#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130 +#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149 #, perl-format msgid " (%s)" msgstr "" -#: ../git-debrebase:1125 +#: ../git-debrebase:1124 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "" -#: ../git-debrebase:1130 +#: ../git-debrebase:1129 msgid "found dgit dsc import" msgstr "" -#: ../git-debrebase:1135 +#: ../git-debrebase:1134 msgid "found bare dgit dsc import with no prior history" msgstr "" -#: ../git-debrebase:1141 +#: ../git-debrebase:1140 msgid "found vanilla merge" msgstr "" -#: ../git-debrebase:1148 +#: ../git-debrebase:1147 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1216 +#: ../git-debrebase:1215 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1217 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1338 +#: ../git-debrebase:1337 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1678 ../git-debrebase:1681 +#: ../git-debrebase:1677 ../git-debrebase:1680 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1684 +#: ../git-debrebase:1683 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1694 +#: ../git-debrebase:1693 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1722 +#: ../git-debrebase:1721 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1736 +#: ../git-debrebase:1735 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1762 +#: ../git-debrebase:1761 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1767 +#: ../git-debrebase:1766 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1769 +#: ../git-debrebase:1768 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1802 +#: ../git-debrebase:1801 #, perl-format msgid "%s already exists" msgstr "" -#: ../git-debrebase:1804 +#: ../git-debrebase:1803 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1827 +#: ../git-debrebase:1826 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1831 +#: ../git-debrebase:1830 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1835 +#: ../git-debrebase:1834 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1857 +#: ../git-debrebase:1856 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1860 +#: ../git-debrebase:1859 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1888 +#: ../git-debrebase:1887 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1896 +#: ../git-debrebase:1895 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1907 +#: ../git-debrebase:1906 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1927 +#: ../git-debrebase:1926 msgid "fast forward" msgstr "" -#: ../git-debrebase:1937 +#: ../git-debrebase:1936 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1949 +#: ../git-debrebase:1948 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:1966 +#: ../git-debrebase:1965 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:1971 +#: ../git-debrebase:1970 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:1989 +#: ../git-debrebase:1988 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:1990 +#: ../git-debrebase:1989 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2010 +#: ../git-debrebase:2009 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2028 +#: ../git-debrebase:2027 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "old anchor is recognized due to --anchor, cannot check upstream" -#: ../git-debrebase:2044 +#: ../git-debrebase:2043 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2053 +#: ../git-debrebase:2052 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2066 +#: ../git-debrebase:2065 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2077 +#: ../git-debrebase:2076 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2080 +#: ../git-debrebase:2079 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2083 +#: ../git-debrebase:2082 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2194 +#: ../git-debrebase:2193 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2198 +#: ../git-debrebase:2197 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 -#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 -#: ../git-debrebase:2402 +#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 +#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 +#: ../git-debrebase:2401 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2237 +#: ../git-debrebase:2236 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2238 +#: ../git-debrebase:2237 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2239 +#: ../git-debrebase:2238 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2240 +#: ../git-debrebase:2239 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2250 +#: ../git-debrebase:2249 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2252 +#: ../git-debrebase:2251 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2268 +#: ../git-debrebase:2267 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2274 +#: ../git-debrebase:2273 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2275 +#: ../git-debrebase:2274 msgid "anchor" msgstr "" -#: ../git-debrebase:2276 +#: ../git-debrebase:2275 msgid "breakwater" msgstr "" -#: ../git-debrebase:2281 +#: ../git-debrebase:2280 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2288 +#: ../git-debrebase:2287 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2291 +#: ../git-debrebase:2290 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2293 +#: ../git-debrebase:2292 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2295 +#: ../git-debrebase:2294 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2298 +#: ../git-debrebase:2297 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2315 ../git-debrebase:2328 +#: ../git-debrebase:2314 ../git-debrebase:2327 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2322 ../git-debrebase:2352 +#: ../git-debrebase:2321 ../git-debrebase:2351 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2391 +#: ../git-debrebase:2390 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2408 +#: ../git-debrebase:2407 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2415 +#: ../git-debrebase:2414 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2435 +#: ../git-debrebase:2434 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2440 +#: ../git-debrebase:2439 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2447 +#: ../git-debrebase:2446 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2455 +#: ../git-debrebase:2454 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2460 +#: ../git-debrebase:2459 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2476 +#: ../git-debrebase:2475 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2480 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2497 +#: ../git-debrebase:2496 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2213,58 +2193,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2505 +#: ../git-debrebase:2504 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2512 +#: ../git-debrebase:2511 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2514 +#: ../git-debrebase:2513 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2520 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2539 +#: ../git-debrebase:2538 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2545 +#: ../git-debrebase:2544 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2548 +#: ../git-debrebase:2547 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2551 +#: ../git-debrebase:2550 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2553 +#: ../git-debrebase:2552 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2555 +#: ../git-debrebase:2554 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2561 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2272,12 +2252,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2608 +#: ../git-debrebase:2607 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2637 +#: ../git-debrebase:2636 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2285,16 +2265,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2658 +#: ../git-debrebase:2657 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2666 +#: ../git-debrebase:2665 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2680 +#: ../git-debrebase:2679 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2302,175 +2282,175 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2684 +#: ../git-debrebase:2683 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2696 +#: ../git-debrebase:2695 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2702 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2709 +#: ../git-debrebase:2708 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2718 +#: ../git-debrebase:2717 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2723 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2755 +#: ../git-debrebase:2754 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2764 +#: ../git-debrebase:2763 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2801 +#: ../git-debrebase:2800 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2810 +#: ../git-debrebase:2809 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2824 +#: ../git-debrebase:2823 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2829 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2837 +#: ../git-debrebase:2836 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2841 +#: ../git-debrebase:2840 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2943 +#: ../git-debrebase:2942 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2953 +#: ../git-debrebase:2952 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:2983 +#: ../git-debrebase:2982 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:293 +#: ../Debian/Dgit.pm:296 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:319 +#: ../Debian/Dgit.pm:322 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:338 +#: ../Debian/Dgit.pm:341 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:340 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:346 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:347 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:353 +#: ../Debian/Dgit.pm:356 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:361 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:363 +#: ../Debian/Dgit.pm:366 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:454 +#: ../Debian/Dgit.pm:457 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:464 +#: ../Debian/Dgit.pm:467 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:483 +#: ../Debian/Dgit.pm:486 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:489 +#: ../Debian/Dgit.pm:492 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:510 +#: ../Debian/Dgit.pm:513 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:516 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:621 +#: ../Debian/Dgit.pm:624 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:622 +#: ../Debian/Dgit.pm:625 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:644 +#: ../Debian/Dgit.pm:647 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:650 +#: ../Debian/Dgit.pm:653 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2478,66 +2458,66 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:764 +#: ../Debian/Dgit.pm:767 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:765 +#: ../Debian/Dgit.pm:768 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:781 +#: ../Debian/Dgit.pm:784 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:790 +#: ../Debian/Dgit.pm:793 #, 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:804 +#: ../Debian/Dgit.pm:807 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:825 +#: ../Debian/Dgit.pm:828 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:914 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:932 +#: ../Debian/Dgit.pm:935 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1000 +#: ../Debian/Dgit.pm:1003 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1023 +#: ../Debian/Dgit.pm:1026 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1031 +#: ../Debian/Dgit.pm:1034 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1040 +#: ../Debian/Dgit.pm:1043 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index f46f89ef..ee453dfa 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-07-21 00:36+0000\n" +"POT-Creation-Date: 2019-08-10 18:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,78 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:264 +#: ../dgit:265 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:271 +#: ../dgit:272 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:279 +#: ../dgit:280 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:284 +#: ../dgit:285 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:516 +#: ../dgit:517 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:521 ../dgit:527 +#: ../dgit:522 ../dgit:528 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:522 +#: ../dgit:523 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:530 +#: ../dgit:531 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:537 +#: ../dgit:538 msgid "protocol message" msgstr "" -#: ../dgit:545 +#: ../dgit:546 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:566 +#: ../dgit:567 msgid "bad byte count" msgstr "" -#: ../dgit:569 +#: ../dgit:570 msgid "data block" msgstr "" -#: ../dgit:650 -#, perl-format -msgid "failed to fetch %s: %s" -msgstr "" - -#: ../dgit:662 +#: ../dgit:649 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:664 +#: ../dgit:651 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:689 +#: ../dgit:676 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,153 +104,147 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:708 +#: ../dgit:695 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:712 +#: ../dgit:699 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:717 +#: ../dgit:704 msgid "too few arguments" msgstr "" -#: ../dgit:833 +#: ../dgit:820 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:836 +#: ../dgit:823 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:856 +#: ../dgit:843 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:897 +#: ../dgit:884 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:912 +#: ../dgit:899 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:928 +#: ../dgit:915 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:948 +#: ../dgit:935 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:966 +#: ../dgit:953 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 +#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 msgid "internal error" msgstr "" -#: ../dgit:973 +#: ../dgit:960 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:977 +#: ../dgit:964 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1000 +#: ../dgit:987 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1163 +#: ../dgit:1150 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1209 +#: ../dgit:1217 #, perl-format -msgid "" -"config requested specific TLS key but do not know how to get curl to use " -"exactly that EE key (%s)" +msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1230 -msgid "ftpmasterapi archive query method takes no data part" -msgstr "" - -#: ../dgit:1238 -msgid "curl failed to print 3-digit HTTP code" -msgstr "" - -#: ../dgit:1242 +#: ../dgit:1224 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1258 +#: ../dgit:1245 +msgid "ftpmasterapi archive query method takes no data part" +msgstr "" + +#: ../dgit:1263 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1262 +#: ../dgit:1267 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1264 +#: ../dgit:1269 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1266 +#: ../dgit:1271 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1268 ../dgit:1293 +#: ../dgit:1273 ../dgit:1298 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1282 +#: ../dgit:1287 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1284 +#: ../dgit:1289 msgid "bad component" msgstr "" -#: ../dgit:1287 +#: ../dgit:1292 msgid "bad filename" msgstr "" -#: ../dgit:1289 +#: ../dgit:1294 msgid "bad sha256sum" msgstr "" -#: ../dgit:1340 +#: ../dgit:1345 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1424 +#: ../dgit:1429 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -263,163 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1448 +#: ../dgit:1453 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1474 +#: ../dgit:1479 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1475 +#: ../dgit:1480 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1580 +#: ../dgit:1585 #, 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:1719 +#: ../dgit:1724 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1722 +#: ../dgit:1727 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1724 +#: ../dgit:1729 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1744 +#: ../dgit:1749 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1750 +#: ../dgit:1755 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1777 +#: ../dgit:1782 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1794 -msgid "unexpected results from git check query - " -msgstr "" - -#: ../dgit:1809 +#: ../dgit:1805 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1824 +#: ../dgit:1820 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1861 +#: ../dgit:1857 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1907 +#: ../dgit:1903 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1918 +#: ../dgit:1914 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1964 +#: ../dgit:1960 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1973 +#: ../dgit:1969 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1977 +#: ../dgit:1973 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1983 +#: ../dgit:1979 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2023 +#: ../dgit:2019 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2036 +#: ../dgit:2032 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2049 +#: ../dgit:2045 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2065 +#: ../dgit:2061 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2070 +#: ../dgit:2066 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2078 +#: ../dgit:2074 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2085 +#: ../dgit:2081 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2113 +#: ../dgit:2109 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2121 +#: ../dgit:2117 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2124 +#: ../dgit:2120 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2143 +#: ../dgit:2139 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2166 +#: ../dgit:2162 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -434,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2178 +#: ../dgit:2174 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2209 +#: ../dgit:2205 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2211 +#: ../dgit:2207 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2213 +#: ../dgit:2209 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 +#: ../dgit:2214 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2243 +#: ../dgit:2239 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2247 +#: ../dgit:2243 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2249 +#: ../dgit:2245 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2252 +#: ../dgit:2248 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2261 +#: ../dgit:2257 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2265 +#: ../dgit:2261 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2268 +#: ../dgit:2264 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2274 +#: ../dgit:2270 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2345 +#: ../dgit:2341 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2407 +#: ../dgit:2403 msgid "package changelog" msgstr "" -#: ../dgit:2447 +#: ../dgit:2443 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2516 ../dgit:2521 +#: ../dgit:2512 ../dgit:2517 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2536 ../dgit:2543 +#: ../dgit:2532 ../dgit:2539 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2569 ../dgit:6035 +#: ../dgit:2565 ../dgit:6037 msgid "source package" msgstr "" -#: ../dgit:2647 +#: ../dgit:2643 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2666 +#: ../dgit:2662 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2675 +#: ../dgit:2671 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -544,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2690 +#: ../dgit:2686 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2694 +#: ../dgit:2690 msgid "Import of source package" msgstr "" -#: ../dgit:2714 +#: ../dgit:2710 #, perl-format msgid "" "\n" @@ -562,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2756 +#: ../dgit:2752 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2760 +#: ../dgit:2756 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2764 +#: ../dgit:2760 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2780 +#: ../dgit:2776 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2875 +#: ../dgit:2871 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2890 +#: ../dgit:2886 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2934 +#: ../dgit:2930 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2949 +#: ../dgit:2945 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:2954 +#: ../dgit:2950 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -616,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3101 +#: ../dgit:3097 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3106 +#: ../dgit:3102 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3111 +#: ../dgit:3107 #, 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:3121 +#: ../dgit:3117 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -642,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3141 +#: ../dgit:3137 msgid "rewrite map" msgstr "" -#: ../dgit:3148 +#: ../dgit:3144 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3152 +#: ../dgit:3148 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3154 +#: ../dgit:3150 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3161 +#: ../dgit:3157 msgid "additional commits" msgstr "" -#: ../dgit:3164 +#: ../dgit:3160 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3189 +#: ../dgit:3185 msgid "last upload to archive" msgstr "" -#: ../dgit:3193 +#: ../dgit:3189 msgid "no version available from the archive" msgstr "" -#: ../dgit:3276 +#: ../dgit:3272 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3283 +#: ../dgit:3279 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3288 +#: ../dgit:3284 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3316 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -699,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3329 +#: ../dgit:3325 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3332 +#: ../dgit:3328 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3353 +#: ../dgit:3349 #, perl-format msgid "" "\n" @@ -715,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3362 +#: ../dgit:3358 #, perl-format msgid "" "\n" @@ -725,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3447 +#: ../dgit:3443 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -733,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3460 +#: ../dgit:3456 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3478 +#: ../dgit:3474 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3480 +#: ../dgit:3476 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3491 +#: ../dgit:3487 #, perl-format msgid "" "\n" @@ -755,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3506 +#: ../dgit:3502 msgid "fetched source tree" msgstr "" -#: ../dgit:3542 +#: ../dgit:3538 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3607 +#: ../dgit:3603 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3621 +#: ../dgit:3617 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3636 +#: ../dgit:3632 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3663 +#: ../dgit:3659 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -786,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3685 +#: ../dgit:3681 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3693 +#: ../dgit:3689 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3732 +#: ../dgit:3728 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3764 +#: ../dgit:3760 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3766 +#: ../dgit:3762 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3805 +#: ../dgit:3801 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -817,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3819 +#: ../dgit:3815 msgid "" "\n" "Key\n" @@ -826,30 +811,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3834 +#: ../dgit:3830 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3852 +#: ../dgit:3848 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3860 +#: ../dgit:3866 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3875 +#: ../dgit:3881 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3891 +#: ../dgit:3893 msgid "fetching existing git history" msgstr "" -#: ../dgit:3895 +#: ../dgit:3896 msgid "starting new git history" msgstr "" @@ -905,178 +890,178 @@ msgid "" "\n" msgstr "" -#: ../dgit:4045 +#: ../dgit:4046 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4060 +#: ../dgit:4061 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4066 +#: ../dgit:4067 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4092 +#: ../dgit:4093 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4095 +#: ../dgit:4096 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4103 +#: ../dgit:4104 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4112 +#: ../dgit:4113 msgid "version currently in archive" msgstr "" -#: ../dgit:4121 +#: ../dgit:4122 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4129 +#: ../dgit:4130 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4140 +#: ../dgit:4141 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4143 +#: ../dgit:4144 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4157 +#: ../dgit:4158 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4213 +#: ../dgit:4214 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4222 +#: ../dgit:4223 msgid "maintainer view tag" msgstr "" -#: ../dgit:4224 +#: ../dgit:4225 msgid "dgit view tag" msgstr "" -#: ../dgit:4225 +#: ../dgit:4226 msgid "current archive contents" msgstr "" -#: ../dgit:4238 +#: ../dgit:4239 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4248 +#: ../dgit:4249 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4249 +#: ../dgit:4250 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4253 +#: ../dgit:4254 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4266 +#: ../dgit:4267 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4274 +#: ../dgit:4275 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4286 +#: ../dgit:4287 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4308 +#: ../dgit:4309 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4362 +#: ../dgit:4363 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5607 +#: ../dgit:5609 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5625 +#: ../dgit:5627 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5634 +#: ../dgit:5636 msgid "root commit" msgstr "" -#: ../dgit:5640 +#: ../dgit:5642 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5652 +#: ../dgit:5654 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5671 +#: ../dgit:5673 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5678 +#: ../dgit:5680 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5690 +#: ../dgit:5692 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5693 +#: ../dgit:5695 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5705 +#: ../dgit:5707 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1084,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5712 +#: ../dgit:5714 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5746 +#: ../dgit:5748 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5747 +#: ../dgit:5749 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5748 +#: ../dgit:5750 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5749 +#: ../dgit:5751 msgid "is series file\n" msgstr "" -#: ../dgit:5750 +#: ../dgit:5752 msgid "too long\n" msgstr "" -#: ../dgit:5754 +#: ../dgit:5756 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5783 +#: ../dgit:5785 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5866 +#: ../dgit:5868 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5884 +#: ../dgit:5886 msgid "converted" msgstr "" -#: ../dgit:5885 +#: ../dgit:5887 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5939 +#: ../dgit:5941 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5949 +#: ../dgit:5951 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6059 +#: ../dgit:6061 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6091 +#: ../dgit:6093 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6096 +#: ../dgit:6098 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6131 +#: ../dgit:6133 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6245 +#: ../dgit:6247 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" @@ -1169,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6259 +#: ../dgit:6261 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6293 +#: ../dgit:6295 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6306 +#: ../dgit:6308 msgid "tarball" msgstr "" -#: ../dgit:6324 +#: ../dgit:6326 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6340 +#: ../dgit:6342 msgid "tarballs" msgstr "" -#: ../dgit:6354 +#: ../dgit:6356 msgid "upstream" msgstr "" -#: ../dgit:6378 +#: ../dgit:6380 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6388 +#: ../dgit:6390 #, 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:6397 +#: ../dgit:6399 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6401 +#: ../dgit:6403 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6408 +#: ../dgit:6410 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6412 +#: ../dgit:6414 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6415 +#: ../dgit:6417 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6418 +#: ../dgit:6420 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6421 +#: ../dgit:6423 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6425 +#: ../dgit:6427 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6436 +#: ../dgit:6438 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6475 +#: ../dgit:6477 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1255,124 +1240,124 @@ msgid "" "\n" msgstr "" -#: ../dgit:6487 +#: ../dgit:6489 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6516 +#: ../dgit:6518 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:6528 +#: ../dgit:6530 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6531 +#: ../dgit:6533 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6534 +#: ../dgit:6536 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6547 +#: ../dgit:6549 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6564 +#: ../dgit:6566 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6578 +#: ../dgit:6580 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6597 +#: ../dgit:6599 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6607 +#: ../dgit:6609 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6616 +#: ../dgit:6618 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6620 +#: ../dgit:6622 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6655 +#: ../dgit:6657 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6657 +#: ../dgit:6659 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6683 +#: ../dgit:6685 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6689 +#: ../dgit:6691 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6692 +#: ../dgit:6694 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6735 +#: ../dgit:6737 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6773 +#: ../dgit:6775 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6780 +#: ../dgit:6782 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6787 +#: ../dgit:6789 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6791 +#: ../dgit:6793 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6796 +#: ../dgit:6798 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6799 +#: ../dgit:6801 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6812 +#: ../dgit:6814 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1380,136 +1365,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6830 +#: ../dgit:6832 msgid "build successful\n" msgstr "" -#: ../dgit:6837 +#: ../dgit:6839 #, 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:6947 +#: ../dgit:6949 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6984 +#: ../dgit:6986 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7004 +#: ../dgit:7006 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7017 +#: ../dgit:7019 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7021 +#: ../dgit:7023 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7030 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7034 +#: ../dgit:7036 msgid "source changes file" msgstr "" -#: ../dgit:7036 +#: ../dgit:7038 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7056 ../dgit:7058 +#: ../dgit:7058 ../dgit:7060 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7071 +#: ../dgit:7073 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:7083 +#: ../dgit:7085 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7087 +#: ../dgit:7089 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:7117 +#: ../dgit:7119 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7138 +#: ../dgit:7140 msgid "source tree" msgstr "" -#: ../dgit:7140 +#: ../dgit:7142 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7153 +#: ../dgit:7155 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7157 +#: ../dgit:7159 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7161 +#: ../dgit:7163 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7178 +#: ../dgit:7180 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7183 +#: ../dgit:7185 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7185 +#: ../dgit:7187 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7196 +#: ../dgit:7198 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7199 +#: ../dgit:7201 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7210 +#: ../dgit:7212 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7221 +#: ../dgit:7223 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7230 +#: ../dgit:7232 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1517,21 +1502,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7237 +#: ../dgit:7239 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7239 +#: ../dgit:7241 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7244 +#: ../dgit:7246 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7249 +#: ../dgit:7251 #, perl-format msgid "" "Branch %s already exists\n" @@ -1539,63 +1524,58 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7269 +#: ../dgit:7271 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7271 +#: ../dgit:7273 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7279 +#: ../dgit:7281 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7298 +#: ../dgit:7300 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7302 +#: ../dgit:7304 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7303 +#: ../dgit:7305 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7314 +#: ../dgit:7316 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7316 +#: ../dgit:7318 msgid "Import, merging." msgstr "" -#: ../dgit:7330 +#: ../dgit:7332 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7341 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7346 +#: ../dgit:7348 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7352 -#, perl-format -msgid "exec curl: %s\n" -msgstr "" - #: ../dgit:7366 msgid "need destination argument" msgstr "" @@ -1646,27 +1626,27 @@ msgstr "" msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7620 +#: ../dgit:7623 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7675 +#: ../dgit:7678 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7690 +#: ../dgit:7693 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7694 +#: ../dgit:7697 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7700 +#: ../dgit:7703 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1674,35 +1654,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7717 +#: ../dgit:7720 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7730 +#: ../dgit:7733 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7750 +#: ../dgit:7753 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7761 +#: ../dgit:7764 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7789 +#: ../dgit:7792 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:7793 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7809 +#: ../dgit:7812 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1735,45 +1715,45 @@ msgstr "" msgid "missing required git config %s" msgstr "" -#: ../git-debrebase:364 +#: ../git-debrebase:363 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "" -#: ../git-debrebase:367 +#: ../git-debrebase:366 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "" -#: ../git-debrebase:380 +#: ../git-debrebase:379 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" -#: ../git-debrebase:386 +#: ../git-debrebase:385 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "" -#: ../git-debrebase:390 +#: ../git-debrebase:389 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f, or --force)" msgstr "" -#: ../git-debrebase:422 +#: ../git-debrebase:421 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" msgstr "" -#: ../git-debrebase:429 +#: ../git-debrebase:428 #, perl-format msgid "" "%s\n" "Is this meant to be a gdr branch? %s\n" msgstr "" -#: ../git-debrebase:434 +#: ../git-debrebase:433 #, perl-format msgid "" "%s\n" @@ -1781,7 +1761,7 @@ msgid "" "Consider git-debrebase scrap, to throw away your recent work.\n" msgstr "" -#: ../git-debrebase:440 +#: ../git-debrebase:439 #, perl-format msgid "" "%s\n" @@ -1789,7 +1769,7 @@ msgid "" "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" msgstr "" -#: ../git-debrebase:451 +#: ../git-debrebase:450 #, perl-format msgid "" "%s\n" @@ -1797,415 +1777,415 @@ msgid "" "Maybe you reset to, or rebased from, somewhere inappropriate.\n" msgstr "" -#: ../git-debrebase:898 +#: ../git-debrebase:897 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "" -#: ../git-debrebase:900 +#: ../git-debrebase:899 msgid "has other than two parents" msgstr "" -#: ../git-debrebase:901 +#: ../git-debrebase:900 msgid "contains debian/patches" msgstr "" -#: ../git-debrebase:927 +#: ../git-debrebase:926 msgid "is an origin commit" msgstr "" -#: ../git-debrebase:929 +#: ../git-debrebase:928 msgid "upstream files differ from left parent" msgstr "" -#: ../git-debrebase:931 +#: ../git-debrebase:930 msgid "debian/ differs from right parent" msgstr "" -#: ../git-debrebase:942 +#: ../git-debrebase:941 msgid "edits debian/patches" msgstr "" -#: ../git-debrebase:954 +#: ../git-debrebase:953 msgid "parent's debian is not a directory" msgstr "" -#: ../git-debrebase:961 +#: ../git-debrebase:960 msgid "no changes" msgstr "" -#: ../git-debrebase:967 +#: ../git-debrebase:966 msgid "origin commit" msgstr "" -#: ../git-debrebase:1018 +#: ../git-debrebase:1017 #, perl-format msgid "unknown kind of merge from %s" msgstr "" -#: ../git-debrebase:1021 +#: ../git-debrebase:1020 msgid "octopus merge" msgstr "" -#: ../git-debrebase:1025 +#: ../git-debrebase:1024 msgid "general two-parent merge" msgstr "" -#: ../git-debrebase:1042 +#: ../git-debrebase:1041 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "" -#: ../git-debrebase:1082 +#: ../git-debrebase:1081 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "" -#: ../git-debrebase:1110 +#: ../git-debrebase:1109 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "" -#: ../git-debrebase:1111 +#: ../git-debrebase:1110 #, perl-format msgid " (eg %s)" msgstr "" -#: ../git-debrebase:1117 +#: ../git-debrebase:1116 msgid "found mixed upstream/packaging commit" msgstr "" -#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 -#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 +#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130 +#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149 #, perl-format msgid " (%s)" msgstr "" -#: ../git-debrebase:1125 +#: ../git-debrebase:1124 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "" -#: ../git-debrebase:1130 +#: ../git-debrebase:1129 msgid "found dgit dsc import" msgstr "" -#: ../git-debrebase:1135 +#: ../git-debrebase:1134 msgid "found bare dgit dsc import with no prior history" msgstr "" -#: ../git-debrebase:1141 +#: ../git-debrebase:1140 msgid "found vanilla merge" msgstr "" -#: ../git-debrebase:1148 +#: ../git-debrebase:1147 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1216 +#: ../git-debrebase:1215 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1217 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1338 +#: ../git-debrebase:1337 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1678 ../git-debrebase:1681 +#: ../git-debrebase:1677 ../git-debrebase:1680 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1684 +#: ../git-debrebase:1683 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1694 +#: ../git-debrebase:1693 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1722 +#: ../git-debrebase:1721 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1736 +#: ../git-debrebase:1735 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1762 +#: ../git-debrebase:1761 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1767 +#: ../git-debrebase:1766 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1769 +#: ../git-debrebase:1768 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1802 +#: ../git-debrebase:1801 #, perl-format msgid "%s already exists" msgstr "" -#: ../git-debrebase:1804 +#: ../git-debrebase:1803 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1827 +#: ../git-debrebase:1826 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1831 +#: ../git-debrebase:1830 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1835 +#: ../git-debrebase:1834 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1857 +#: ../git-debrebase:1856 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1860 +#: ../git-debrebase:1859 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1888 +#: ../git-debrebase:1887 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1896 +#: ../git-debrebase:1895 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1907 +#: ../git-debrebase:1906 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1927 +#: ../git-debrebase:1926 msgid "fast forward" msgstr "" -#: ../git-debrebase:1937 +#: ../git-debrebase:1936 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1949 +#: ../git-debrebase:1948 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:1966 +#: ../git-debrebase:1965 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:1971 +#: ../git-debrebase:1970 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:1989 +#: ../git-debrebase:1988 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:1990 +#: ../git-debrebase:1989 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2010 +#: ../git-debrebase:2009 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2028 +#: ../git-debrebase:2027 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" -#: ../git-debrebase:2044 +#: ../git-debrebase:2043 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2053 +#: ../git-debrebase:2052 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2066 +#: ../git-debrebase:2065 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2077 +#: ../git-debrebase:2076 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2080 +#: ../git-debrebase:2079 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2083 +#: ../git-debrebase:2082 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2194 +#: ../git-debrebase:2193 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2198 +#: ../git-debrebase:2197 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 -#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 -#: ../git-debrebase:2402 +#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 +#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 +#: ../git-debrebase:2401 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2237 +#: ../git-debrebase:2236 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2238 +#: ../git-debrebase:2237 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2239 +#: ../git-debrebase:2238 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2240 +#: ../git-debrebase:2239 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2250 +#: ../git-debrebase:2249 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2252 +#: ../git-debrebase:2251 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2268 +#: ../git-debrebase:2267 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2274 +#: ../git-debrebase:2273 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2275 +#: ../git-debrebase:2274 msgid "anchor" msgstr "" -#: ../git-debrebase:2276 +#: ../git-debrebase:2275 msgid "breakwater" msgstr "" -#: ../git-debrebase:2281 +#: ../git-debrebase:2280 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2288 +#: ../git-debrebase:2287 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2291 +#: ../git-debrebase:2290 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2293 +#: ../git-debrebase:2292 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2295 +#: ../git-debrebase:2294 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2298 +#: ../git-debrebase:2297 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2315 ../git-debrebase:2328 +#: ../git-debrebase:2314 ../git-debrebase:2327 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2322 ../git-debrebase:2352 +#: ../git-debrebase:2321 ../git-debrebase:2351 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2391 +#: ../git-debrebase:2390 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2408 +#: ../git-debrebase:2407 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2415 +#: ../git-debrebase:2414 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2435 +#: ../git-debrebase:2434 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2440 +#: ../git-debrebase:2439 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2447 +#: ../git-debrebase:2446 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2455 +#: ../git-debrebase:2454 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2460 +#: ../git-debrebase:2459 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2476 +#: ../git-debrebase:2475 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2480 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2497 +#: ../git-debrebase:2496 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2213,58 +2193,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2505 +#: ../git-debrebase:2504 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2512 +#: ../git-debrebase:2511 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2514 +#: ../git-debrebase:2513 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2520 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2539 +#: ../git-debrebase:2538 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2545 +#: ../git-debrebase:2544 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2548 +#: ../git-debrebase:2547 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2551 +#: ../git-debrebase:2550 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2553 +#: ../git-debrebase:2552 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2555 +#: ../git-debrebase:2554 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2561 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2272,12 +2252,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2608 +#: ../git-debrebase:2607 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2637 +#: ../git-debrebase:2636 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2285,16 +2265,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2658 +#: ../git-debrebase:2657 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2666 +#: ../git-debrebase:2665 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2680 +#: ../git-debrebase:2679 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2302,175 +2282,175 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2684 +#: ../git-debrebase:2683 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2696 +#: ../git-debrebase:2695 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2702 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2709 +#: ../git-debrebase:2708 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2718 +#: ../git-debrebase:2717 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2723 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2755 +#: ../git-debrebase:2754 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2764 +#: ../git-debrebase:2763 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2801 +#: ../git-debrebase:2800 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2810 +#: ../git-debrebase:2809 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2824 +#: ../git-debrebase:2823 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2829 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2837 +#: ../git-debrebase:2836 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2841 +#: ../git-debrebase:2840 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2943 +#: ../git-debrebase:2942 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2953 +#: ../git-debrebase:2952 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:2983 +#: ../git-debrebase:2982 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:293 +#: ../Debian/Dgit.pm:296 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:319 +#: ../Debian/Dgit.pm:322 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:338 +#: ../Debian/Dgit.pm:341 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:340 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:346 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:347 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:353 +#: ../Debian/Dgit.pm:356 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:361 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:363 +#: ../Debian/Dgit.pm:366 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:454 +#: ../Debian/Dgit.pm:457 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:464 +#: ../Debian/Dgit.pm:467 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:483 +#: ../Debian/Dgit.pm:486 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:489 +#: ../Debian/Dgit.pm:492 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:510 +#: ../Debian/Dgit.pm:513 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:516 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:621 +#: ../Debian/Dgit.pm:624 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:622 +#: ../Debian/Dgit.pm:625 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:644 +#: ../Debian/Dgit.pm:647 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:650 +#: ../Debian/Dgit.pm:653 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2478,66 +2458,66 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:764 +#: ../Debian/Dgit.pm:767 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:765 +#: ../Debian/Dgit.pm:768 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:781 +#: ../Debian/Dgit.pm:784 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:790 +#: ../Debian/Dgit.pm:793 #, 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:804 +#: ../Debian/Dgit.pm:807 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:825 +#: ../Debian/Dgit.pm:828 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:914 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:932 +#: ../Debian/Dgit.pm:935 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1000 +#: ../Debian/Dgit.pm:1003 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1023 +#: ../Debian/Dgit.pm:1026 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1031 +#: ../Debian/Dgit.pm:1034 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1040 +#: ../Debian/Dgit.pm:1043 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/nl.po b/po/nl.po index 8e5129de..837aaa71 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-21 00:36+0000\n" +"POT-Creation-Date: 2019-08-10 18:42+0000\n" "PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -19,79 +19,74 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:264 +#: ../dgit:265 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:271 +#: ../dgit:272 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:279 +#: ../dgit:280 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:284 +#: ../dgit:285 #, 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:516 +#: ../dgit:517 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:521 ../dgit:527 +#: ../dgit:522 ../dgit:528 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:522 +#: ../dgit:523 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:530 +#: ../dgit:531 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:537 +#: ../dgit:538 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:545 +#: ../dgit:546 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:566 +#: ../dgit:567 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:569 +#: ../dgit:570 msgid "data block" msgstr "gegevensblok" -#: ../dgit:650 -#, perl-format -msgid "failed to fetch %s: %s" -msgstr "ophalen (fetch) van %s mislukt: %s" - -#: ../dgit:662 +#: ../dgit:649 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:664 +#: ../dgit:651 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:689 +#: ../dgit:676 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -131,13 +126,13 @@ msgstr "" " -c= configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:708 +#: ../dgit:695 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:712 +#: ../dgit:699 #, perl-format msgid "" "%s: %s\n" @@ -146,22 +141,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:717 +#: ../dgit:704 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:833 +#: ../dgit:820 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:836 +#: ../dgit:823 #, 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:856 +#: ../dgit:843 #, perl-format msgid "" "need value for one of: %s\n" @@ -170,45 +165,45 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:897 +#: ../dgit:884 #, 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:912 +#: ../dgit:899 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:928 +#: ../dgit:915 #, 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:948 +#: ../dgit:935 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:966 +#: ../dgit:953 #, fuzzy, perl-format #| msgid "unknown %s setting `%s'" msgid "unknown %s `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 +#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 msgid "internal error" msgstr "interne fout" -#: ../dgit:973 +#: ../dgit:960 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:977 +#: ../dgit:964 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -217,90 +212,83 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1000 +#: ../dgit:987 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1163 +#: ../dgit:1150 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:1209 +#: ../dgit:1217 +#, 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 #, perl-format -msgid "" -"config requested specific TLS key but do not know how to get curl to use " -"exactly that EE key (%s)" -msgstr "" -"de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl " -"ertoe te brengen exact die EE-sleutel (%s) te gebruiken" +msgid "fetch of %s gave HTTP code %s" +msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1230 +#: ../dgit:1245 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1238 -msgid "curl failed to print 3-digit HTTP code" -msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" - -#: ../dgit:1242 -#, perl-format -msgid "fetch of %s gave HTTP code %s" -msgstr "een fetch van %s gaf HTTP-code %s" - -#: ../dgit:1258 +#: ../dgit:1263 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1262 +#: ../dgit:1267 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1264 +#: ../dgit:1269 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1266 +#: ../dgit:1271 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1268 ../dgit:1293 +#: ../dgit:1273 ../dgit:1298 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1282 +#: ../dgit:1287 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1284 +#: ../dgit:1289 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1287 +#: ../dgit:1292 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1289 +#: ../dgit:1294 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1340 +#: ../dgit:1345 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1424 +#: ../dgit:1429 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -313,21 +301,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1448 +#: ../dgit:1453 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1474 +#: ../dgit:1479 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1475 +#: ../dgit:1480 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1580 +#: ../dgit:1585 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -336,138 +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:1719 +#: ../dgit:1724 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1722 +#: ../dgit:1727 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1724 +#: ../dgit:1729 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1744 +#: ../dgit:1749 #, 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:1750 +#: ../dgit:1755 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1777 +#: ../dgit:1782 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1794 -msgid "unexpected results from git check query - " -msgstr "het verzoek git check leverde onverwachte resultaten op - " - -#: ../dgit:1809 +#: ../dgit:1805 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1824 +#: ../dgit:1820 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1861 +#: ../dgit:1857 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1907 +#: ../dgit:1903 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1918 +#: ../dgit:1914 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1964 +#: ../dgit:1960 #, 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:1973 +#: ../dgit:1969 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1977 +#: ../dgit:1973 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1983 +#: ../dgit:1979 #, 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:2023 +#: ../dgit:2019 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2036 +#: ../dgit:2032 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2049 +#: ../dgit:2045 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:2065 +#: ../dgit:2061 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2070 +#: ../dgit:2066 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2078 +#: ../dgit:2074 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2085 +#: ../dgit:2081 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2113 +#: ../dgit:2109 #, 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:2121 +#: ../dgit:2117 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2124 +#: ../dgit:2120 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2143 +#: ../dgit:2139 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -476,7 +460,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2166 +#: ../dgit:2162 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -503,7 +487,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2178 +#: ../dgit:2174 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -511,24 +495,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2209 +#: ../dgit:2205 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2211 +#: ../dgit:2207 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2213 +#: ../dgit:2209 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2218 +#: ../dgit:2214 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2243 +#: ../dgit:2239 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -536,80 +520,80 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2247 +#: ../dgit:2243 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2249 +#: ../dgit:2245 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2252 +#: ../dgit:2248 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2261 +#: ../dgit:2257 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2265 +#: ../dgit:2261 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2268 +#: ../dgit:2264 #, 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:2274 +#: ../dgit:2270 #, 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:2345 +#: ../dgit:2341 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2407 +#: ../dgit:2403 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2447 +#: ../dgit:2443 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2516 ../dgit:2521 +#: ../dgit:2512 ../dgit:2517 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2536 ../dgit:2543 +#: ../dgit:2532 ../dgit:2539 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2569 ../dgit:6035 +#: ../dgit:2565 ../dgit:6037 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2647 +#: ../dgit:2643 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2666 +#: ../dgit:2662 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2675 +#: ../dgit:2671 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -622,16 +606,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2690 +#: ../dgit:2686 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2694 +#: ../dgit:2690 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2714 +#: ../dgit:2710 #, perl-format msgid "" "\n" @@ -644,12 +628,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2756 +#: ../dgit:2752 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2760 +#: ../dgit:2756 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -658,12 +642,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2764 +#: ../dgit:2760 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2780 +#: ../dgit:2776 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -671,24 +655,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2875 +#: ../dgit:2871 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2890 +#: ../dgit:2886 #, 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:2934 +#: ../dgit:2930 #, 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:2949 +#: ../dgit:2945 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" @@ -698,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:2954 +#: ../dgit:2950 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -714,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:3101 +#: ../dgit:3097 #, 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:3106 +#: ../dgit:3102 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3111 +#: ../dgit:3107 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -735,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:3121 +#: ../dgit:3117 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -748,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:3141 +#: ../dgit:3137 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3148 +#: ../dgit:3144 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:3152 +#: ../dgit:3148 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3154 +#: ../dgit:3150 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:3161 +#: ../dgit:3157 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3164 +#: ../dgit:3160 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -780,27 +764,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3189 +#: ../dgit:3185 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3193 +#: ../dgit:3189 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3276 +#: ../dgit:3272 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3283 +#: ../dgit:3279 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3288 +#: ../dgit:3284 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3316 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -816,15 +800,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3329 +#: ../dgit:3325 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3332 +#: ../dgit:3328 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3353 +#: ../dgit:3349 #, perl-format msgid "" "\n" @@ -836,7 +820,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3362 +#: ../dgit:3358 #, perl-format msgid "" "\n" @@ -851,7 +835,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3447 +#: ../dgit:3443 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -862,19 +846,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3460 +#: ../dgit:3456 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3478 +#: ../dgit:3474 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3480 +#: ../dgit:3476 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3491 +#: ../dgit:3487 #, perl-format msgid "" "\n" @@ -890,15 +874,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3506 +#: ../dgit:3502 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3542 +#: ../dgit:3538 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3607 +#: ../dgit:3603 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -906,16 +890,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3621 +#: ../dgit:3617 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:3636 +#: ../dgit:3632 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3663 +#: ../dgit:3659 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -926,32 +910,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3685 +#: ../dgit:3681 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3693 +#: ../dgit:3689 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3732 +#: ../dgit:3728 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3764 +#: ../dgit:3760 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3766 +#: ../dgit:3762 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:3805 +#: ../dgit:3801 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -962,7 +946,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3819 +#: ../dgit:3815 msgid "" "\n" "Key\n" @@ -976,30 +960,30 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3834 +#: ../dgit:3830 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3852 +#: ../dgit:3848 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3860 +#: ../dgit:3866 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3875 +#: ../dgit:3881 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3891 +#: ../dgit:3893 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3895 +#: ../dgit:3896 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" @@ -1064,7 +1048,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4045 +#: ../dgit:4046 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1072,60 +1056,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4060 +#: ../dgit:4061 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4066 +#: ../dgit:4067 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4092 +#: ../dgit:4093 #, 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:4095 +#: ../dgit:4096 #, 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:4103 +#: ../dgit:4104 #, 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:4112 +#: ../dgit:4113 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4121 +#: ../dgit:4122 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4129 +#: ../dgit:4130 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4140 +#: ../dgit:4141 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4143 +#: ../dgit:4144 #, perl-format msgid "" "%s is %s\n" @@ -1134,99 +1118,99 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4157 +#: ../dgit:4158 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4213 +#: ../dgit:4214 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4222 +#: ../dgit:4223 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4224 +#: ../dgit:4225 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4225 +#: ../dgit:4226 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4238 +#: ../dgit:4239 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:4248 +#: ../dgit:4249 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4249 +#: ../dgit:4250 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4253 +#: ../dgit:4254 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4266 +#: ../dgit:4267 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4274 +#: ../dgit:4275 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4286 +#: ../dgit:4287 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4308 +#: ../dgit:4309 #, 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:4362 +#: ../dgit:4363 #, 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:5607 +#: ../dgit:5609 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5625 +#: ../dgit:5627 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5634 +#: ../dgit:5636 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5640 +#: ../dgit:5642 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5652 +#: ../dgit:5654 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5671 +#: ../dgit:5673 #, perl-format msgid "" "\n" @@ -1235,23 +1219,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5678 +#: ../dgit:5680 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5690 +#: ../dgit:5692 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:5693 +#: ../dgit:5695 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5705 +#: ../dgit:5707 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1262,88 +1246,88 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5712 +#: ../dgit:5714 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5746 +#: ../dgit:5748 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5747 +#: ../dgit:5749 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5748 +#: ../dgit:5750 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5749 +#: ../dgit:5751 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5750 +#: ../dgit:5752 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5754 +#: ../dgit:5756 #, 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:5783 +#: ../dgit:5785 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5866 +#: ../dgit:5868 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5884 +#: ../dgit:5886 msgid "converted" msgstr "omgezet" -#: ../dgit:5885 +#: ../dgit:5887 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5939 +#: ../dgit:5941 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5949 +#: ../dgit:5951 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6059 +#: ../dgit:6061 #, 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:6091 +#: ../dgit:6093 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6096 +#: ../dgit:6098 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6131 +#: ../dgit:6133 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6245 +#: ../dgit:6247 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" @@ -1357,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:6259 +#: ../dgit:6261 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6293 +#: ../dgit:6295 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6306 +#: ../dgit:6308 msgid "tarball" msgstr "" -#: ../dgit:6324 +#: ../dgit:6326 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6340 +#: ../dgit:6342 msgid "tarballs" msgstr "" -#: ../dgit:6354 +#: ../dgit:6356 msgid "upstream" msgstr "" -#: ../dgit:6378 +#: ../dgit:6380 #, 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:6388 +#: ../dgit:6390 #, fuzzy, perl-format #| msgid "" #| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1399,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:6397 +#: ../dgit:6399 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6401 +#: ../dgit:6403 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:6408 +#: ../dgit:6410 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6412 +#: ../dgit:6414 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6415 +#: ../dgit:6417 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6418 +#: ../dgit:6420 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:6421 +#: ../dgit:6423 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6425 +#: ../dgit:6427 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:6436 +#: ../dgit:6438 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6475 +#: ../dgit:6477 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1461,13 +1445,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6487 +#: ../dgit:6489 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:6516 +#: ../dgit:6518 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" @@ -1479,18 +1463,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6528 +#: ../dgit:6530 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6531 +#: ../dgit:6533 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:6534 +#: ../dgit:6536 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1498,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:6547 +#: ../dgit:6549 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6564 +#: ../dgit:6566 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6578 +#: ../dgit:6580 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6597 +#: ../dgit:6599 #, 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:6607 +#: ../dgit:6609 #, fuzzy #| msgid "dgit: --include-dirty is not supported in split view quilt mode" msgid "" @@ -1530,76 +1514,76 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " "weergave" -#: ../dgit:6616 +#: ../dgit:6618 #, fuzzy, perl-format #| msgid "dgit: import-dsc: %s" msgid "dgit: --quilt=%s, %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6620 +#: ../dgit:6622 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6655 +#: ../dgit:6657 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6657 +#: ../dgit:6659 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6683 +#: ../dgit:6685 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:6689 +#: ../dgit:6691 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6692 +#: ../dgit:6694 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:6735 +#: ../dgit:6737 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6773 +#: ../dgit:6775 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6780 +#: ../dgit:6782 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6787 +#: ../dgit:6789 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6791 +#: ../dgit:6793 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6796 +#: ../dgit:6798 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6799 +#: ../dgit:6801 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6812 +#: ../dgit:6814 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1611,11 +1595,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6830 +#: ../dgit:6832 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6837 +#: ../dgit:6839 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1626,30 +1610,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6947 +#: ../dgit:6949 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6984 +#: ../dgit:6986 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7004 +#: ../dgit:7006 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7017 +#: ../dgit:7019 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7021 +#: ../dgit:7023 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7028 +#: ../dgit:7030 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -1657,21 +1641,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7034 +#: ../dgit:7036 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7036 +#: ../dgit:7038 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7056 ../dgit:7058 +#: ../dgit:7058 ../dgit:7060 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7071 +#: ../dgit:7073 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" @@ -1680,7 +1664,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7083 +#: ../dgit:7085 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -1688,7 +1672,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7087 +#: ../dgit:7089 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -1697,65 +1681,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7117 +#: ../dgit:7119 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7138 +#: ../dgit:7140 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7140 +#: ../dgit:7142 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7153 +#: ../dgit:7155 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7157 +#: ../dgit:7159 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7161 +#: ../dgit:7163 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7178 +#: ../dgit:7180 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7183 +#: ../dgit:7185 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7185 +#: ../dgit:7187 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7196 +#: ../dgit:7198 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7199 +#: ../dgit:7201 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7210 +#: ../dgit:7212 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7221 +#: ../dgit:7223 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:7230 +#: ../dgit:7232 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1766,21 +1750,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:7237 +#: ../dgit:7239 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:7239 +#: ../dgit:7241 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:7244 +#: ../dgit:7246 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7249 +#: ../dgit:7251 #, perl-format msgid "" "Branch %s already exists\n" @@ -1792,63 +1776,58 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7269 +#: ../dgit:7271 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7271 +#: ../dgit:7273 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7279 +#: ../dgit:7281 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7298 +#: ../dgit:7300 #, 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:7302 +#: ../dgit:7304 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7303 +#: ../dgit:7305 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7314 +#: ../dgit:7316 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7316 +#: ../dgit:7318 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7330 +#: ../dgit:7332 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7339 +#: ../dgit:7341 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7346 +#: ../dgit:7348 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7352 -#, perl-format -msgid "exec curl: %s\n" -msgstr "exec curl: %s\n" - #: ../dgit:7366 msgid "need destination argument" msgstr "bestemmingsargument nodig" @@ -1901,27 +1880,27 @@ msgstr "foute waarde `%s' voor %s" msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7620 +#: ../dgit:7623 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7675 +#: ../dgit:7678 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7690 +#: ../dgit:7693 #, 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:7694 +#: ../dgit:7697 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7700 +#: ../dgit:7703 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1932,37 +1911,37 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7717 +#: ../dgit:7720 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7730 +#: ../dgit:7733 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7750 +#: ../dgit:7753 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7761 +#: ../dgit:7764 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7789 +#: ../dgit:7792 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7790 +#: ../dgit:7793 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7809 +#: ../dgit:7812 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -2004,35 +1983,35 @@ msgstr "foutieve opties volgen na `git-debrebase %s'" msgid "missing required git config %s" msgstr "de vereiste git-configuratie %s ontbreekt" -#: ../git-debrebase:364 +#: ../git-debrebase:363 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "%s: moeilijkheid (snag) genegeerd (-f%s): %s\n" -#: ../git-debrebase:367 +#: ../git-debrebase:366 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "%s: moeilijkheid (snag) gevonden (-f%s): %s\n" -#: ../git-debrebase:380 +#: ../git-debrebase:379 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" "%s: moeilijkheden (snags): %d overschreven door individuele -f opties\n" -#: ../git-debrebase:386 +#: ../git-debrebase:385 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "%s: moeilijkheden (snags): %d overschreven door het globale --force\n" -#: ../git-debrebase:390 +#: ../git-debrebase:389 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f, or --force)" msgstr "" "%s: moeilijkheden (snags): %d blokker(s) (u zou -f of --force kunnen " "gebruiken)" -#: ../git-debrebase:422 +#: ../git-debrebase:421 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" @@ -2040,7 +2019,7 @@ msgstr "" "Tak/geschiedenis lijkt verknoeid - niet langer in gdr-indeling.\n" "Zie ILLEGAL OPERATIONS (ongeldige bewerkingen) in git-debrebase(5).\n" -#: ../git-debrebase:429 +#: ../git-debrebase:428 #, perl-format msgid "" "%s\n" @@ -2049,7 +2028,7 @@ msgstr "" "%s\n" "Zou dit een gdr-tak moeten zijn? %s\n" -#: ../git-debrebase:434 +#: ../git-debrebase:433 #, perl-format msgid "" "%s\n" @@ -2060,7 +2039,7 @@ msgstr "" "%s\n" "Overweeg git-debrebase scrap, om uw recent werk weg te gooien.\n" -#: ../git-debrebase:440 +#: ../git-debrebase:439 #, perl-format msgid "" "%s\n" @@ -2071,7 +2050,7 @@ msgstr "" "Tak lijkt niet bedoeld te zijn als git-debrebase tak?\n" "Foute tak, of misschien had u git-debrebase convert-from-* nodig.\n" -#: ../git-debrebase:451 +#: ../git-debrebase:450 #, perl-format msgid "" "%s\n" @@ -2083,254 +2062,254 @@ msgstr "" "Misschien voerde u een reset naar of een rebase van een ongepaste plaats " "uit.\n" -#: ../git-debrebase:898 +#: ../git-debrebase:897 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "git-debrebase `anker' maar %s" -#: ../git-debrebase:900 +#: ../git-debrebase:899 msgid "has other than two parents" msgstr "heeft iets anders dan twee ouders" -#: ../git-debrebase:901 +#: ../git-debrebase:900 msgid "contains debian/patches" msgstr "bevat debian/patches" -#: ../git-debrebase:927 +#: ../git-debrebase:926 msgid "is an origin commit" msgstr "is een externe vastlegging (origin commit)" -#: ../git-debrebase:929 +#: ../git-debrebase:928 msgid "upstream files differ from left parent" msgstr "bestanden van de toeleveraar verschillen van de linkerouder" -#: ../git-debrebase:931 +#: ../git-debrebase:930 msgid "debian/ differs from right parent" msgstr "debian/ verschilt van de rechterouder" -#: ../git-debrebase:942 +#: ../git-debrebase:941 msgid "edits debian/patches" msgstr "bewerkt debian/patches" -#: ../git-debrebase:954 +#: ../git-debrebase:953 msgid "parent's debian is not a directory" msgstr "bij de ouder is debian geen map" -#: ../git-debrebase:961 +#: ../git-debrebase:960 msgid "no changes" msgstr "geen wijzigingen" -#: ../git-debrebase:967 +#: ../git-debrebase:966 msgid "origin commit" msgstr "externe vastlegging (origin commit)" -#: ../git-debrebase:1018 +#: ../git-debrebase:1017 #, perl-format msgid "unknown kind of merge from %s" msgstr "onbekend soort samenvoeging vanuit %s" -#: ../git-debrebase:1021 +#: ../git-debrebase:1020 msgid "octopus merge" msgstr "meervoudige samenvoeging (octopus merge)" -#: ../git-debrebase:1025 +#: ../git-debrebase:1024 msgid "general two-parent merge" msgstr "algemene twee-oudersamenvoeging (two-parent merge)" -#: ../git-debrebase:1042 +#: ../git-debrebase:1041 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "strijdige ankers in samengevoegde golfbrekers (merged-breakwaters) %s" -#: ../git-debrebase:1082 +#: ../git-debrebase:1081 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s" -#: ../git-debrebase:1110 +#: ../git-debrebase:1109 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "wijziging (%s) bij het verpakken volgt de wijziging van de toeleveraar" -#: ../git-debrebase:1111 +#: ../git-debrebase:1110 #, perl-format msgid " (eg %s)" msgstr " (bijv. %s)" -#: ../git-debrebase:1117 +#: ../git-debrebase:1116 msgid "found mixed upstream/packaging commit" msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" -#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 -#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 +#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130 +#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149 #, perl-format msgid " (%s)" msgstr " (%s)" -#: ../git-debrebase:1125 +#: ../git-debrebase:1124 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "vastlegging in verband met uitwisselingsbeheer aangetroffen (%s)" -#: ../git-debrebase:1130 +#: ../git-debrebase:1129 msgid "found dgit dsc import" msgstr "dsc-import door dgit aangetroffen" -#: ../git-debrebase:1135 +#: ../git-debrebase:1134 msgid "found bare dgit dsc import with no prior history" msgstr "" "kale dsc-import door dgit aangetroffen zonder voorafgaande geschiedenis" -#: ../git-debrebase:1141 +#: ../git-debrebase:1140 msgid "found vanilla merge" msgstr "standaardsamenvoeging (vanilla merge) aangetroffen" -#: ../git-debrebase:1148 +#: ../git-debrebase:1147 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s" -#: ../git-debrebase:1216 +#: ../git-debrebase:1215 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om; %3$s: " "(vastlegging %1$s) (d.%2$s)" -#: ../git-debrebase:1217 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: (vastlegging " "%1$s) (d.%2$s)" -#: ../git-debrebase:1338 +#: ../git-debrebase:1337 msgid "bare dgit dsc import" msgstr "kale dsc-import door dgit" -#: ../git-debrebase:1678 ../git-debrebase:1681 +#: ../git-debrebase:1677 ../git-debrebase:1680 #, perl-format msgid "mismatch %s ?" msgstr "discrepantie %s ?" -#: ../git-debrebase:1684 +#: ../git-debrebase:1683 #, perl-format msgid "mismatch %s != %s ?" msgstr "discrepantie %s != %s ?" -#: ../git-debrebase:1694 +#: ../git-debrebase:1693 #, perl-format msgid "internal error %#x %s %s" msgstr "interne fout %#x %s %s" -#: ../git-debrebase:1722 +#: ../git-debrebase:1721 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "%s: gewassen (laundered) (head was %s)\n" -#: ../git-debrebase:1736 +#: ../git-debrebase:1735 msgid "you are in the middle of a git-rebase already" msgstr "u bent reeds middenin een git-rebase" -#: ../git-debrebase:1762 +#: ../git-debrebase:1761 msgid "launder for rebase" msgstr "wassen (launder) voor rebase" -#: ../git-debrebase:1767 +#: ../git-debrebase:1766 msgid "analyse does not support any options" msgstr "analyse ondersteunt geen opties" -#: ../git-debrebase:1769 +#: ../git-debrebase:1768 msgid "too many arguments to analyse" msgstr "te veel argumenten om te analyseren" -#: ../git-debrebase:1802 +#: ../git-debrebase:1801 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../git-debrebase:1804 +#: ../git-debrebase:1803 msgid "HEAD symref is not to refs/heads/" msgstr "HEAD symref wijst niet naar refs/heads/" -#: ../git-debrebase:1827 +#: ../git-debrebase:1826 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "Oké, u bent voor op %s\n" -#: ../git-debrebase:1831 +#: ../git-debrebase:1830 #, perl-format msgid "you are behind %s, divergence risk" msgstr "u bent achter op %s, gevaar voor uiteenlopen" -#: ../git-debrebase:1835 +#: ../git-debrebase:1834 #, perl-format msgid "you have diverged from %s" msgstr "u bent uiteengelopen van %s" -#: ../git-debrebase:1857 +#: ../git-debrebase:1856 msgid "remote dgit branch" msgstr "externe dgit-tak" -#: ../git-debrebase:1860 +#: ../git-debrebase:1859 msgid "remote dgit branch for sid" msgstr "externe dgit-tak voor sid" -#: ../git-debrebase:1888 +#: ../git-debrebase:1887 msgid "Recorded previous head for preservation" msgstr "Vorige head voor behoud opgetekend" -#: ../git-debrebase:1896 +#: ../git-debrebase:1895 #, perl-format msgid "could not record ffq-prev: %s" msgstr "kon ffq-prev niet optekenen: %s" -#: ../git-debrebase:1907 +#: ../git-debrebase:1906 #, perl-format msgid "could not check ffq-prev: %s" msgstr "kon ffq-prev niet controleren: %s" -#: ../git-debrebase:1927 +#: ../git-debrebase:1926 msgid "fast forward" msgstr "lineair (fast forward)" -#: ../git-debrebase:1937 +#: ../git-debrebase:1936 msgid "Declare fast forward / record previous work" msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" -#: ../git-debrebase:1949 +#: ../git-debrebase:1948 msgid "No ffq-prev to stitch." msgstr "Geen ffq-prev om te borduren." -#: ../git-debrebase:1966 +#: ../git-debrebase:1965 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" -#: ../git-debrebase:1971 +#: ../git-debrebase:1970 #, perl-format msgid "bad version number `%s'" msgstr "fout versienummer `%s'" -#: ../git-debrebase:1989 +#: ../git-debrebase:1988 #, perl-format msgid "upstream piece `%s'" msgstr "toeleveraarsstuk `%s'" -#: ../git-debrebase:1990 +#: ../git-debrebase:1989 msgid "upstream (main piece" msgstr "van de toeleveraar (belangrijkste stuk" -#: ../git-debrebase:2010 +#: ../git-debrebase:2009 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" -#: ../git-debrebase:2028 +#: ../git-debrebase:2027 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" "oud anker werd herkend omwille van --anchor, kan niet controleren bij " "toeleveraar" -#: ../git-debrebase:2044 +#: ../git-debrebase:2043 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " @@ -2340,14 +2319,14 @@ msgstr "" "(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " "stuk plus misschien een eerdere combinatie)" -#: ../git-debrebase:2053 +#: ../git-debrebase:2052 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" "eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet " "`.'" -#: ../git-debrebase:2066 +#: ../git-debrebase:2065 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " @@ -2356,118 +2335,118 @@ msgstr "" "vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-" "combine'-vastlegging" -#: ../git-debrebase:2077 +#: ../git-debrebase:2076 #, perl-format msgid "introducing upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt ingevoerd" -#: ../git-debrebase:2080 +#: ../git-debrebase:2079 #, perl-format msgid "dropping upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt weggelaten" -#: ../git-debrebase:2083 +#: ../git-debrebase:2082 #, perl-format msgid "not fast forward: %s %s" msgstr "niet lineair (fast forward): %s %s" -#: ../git-debrebase:2194 +#: ../git-debrebase:2193 msgid "Previous head already recorded\n" msgstr "Vorige head reeds opgenomen\n" -#: ../git-debrebase:2198 +#: ../git-debrebase:2197 #, perl-format msgid "Could not preserve: %s" msgstr "Niet in staat te behouden: %s" -#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 -#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 -#: ../git-debrebase:2402 +#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 +#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 +#: ../git-debrebase:2401 msgid "no arguments allowed" msgstr "geen argumenten toegelaten" -#: ../git-debrebase:2237 +#: ../git-debrebase:2236 msgid "branch contains furniture (not laundered)" msgstr "tak bevat stoffering (niet gewassen)" -#: ../git-debrebase:2238 +#: ../git-debrebase:2237 msgid "branch is unlaundered" msgstr "tak is ongewassen (unlaundered)" -#: ../git-debrebase:2239 +#: ../git-debrebase:2238 msgid "branch needs laundering" msgstr "tak heeft wasbeurt nodig" -#: ../git-debrebase:2240 +#: ../git-debrebase:2239 msgid "branch not in git-debrebase form" msgstr "tak is niet in git-debrebase-indeling" -#: ../git-debrebase:2250 +#: ../git-debrebase:2249 msgid "current branch contents, in git-debrebase terms:\n" msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2252 +#: ../git-debrebase:2251 msgid " branch is laundered\n" msgstr " tak is gewassen\n" -#: ../git-debrebase:2268 +#: ../git-debrebase:2267 #, perl-format msgid " %s is not well-defined\n" msgstr " %s is niet goed gedefinieerd\n" -#: ../git-debrebase:2274 +#: ../git-debrebase:2273 msgid "key git-debrebase commits:\n" msgstr "kern-git-debrebase-vastleggingen:\n" -#: ../git-debrebase:2275 +#: ../git-debrebase:2274 msgid "anchor" msgstr "anker" -#: ../git-debrebase:2276 +#: ../git-debrebase:2275 msgid "breakwater" msgstr "golfbreker (breakwater)" -#: ../git-debrebase:2281 +#: ../git-debrebase:2280 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2288 +#: ../git-debrebase:2287 msgid " unstitched; previous tip was:\n" msgstr " borduursel losgemaakt; vorige tip was:\n" -#: ../git-debrebase:2291 +#: ../git-debrebase:2290 msgid " stitched? (no record of git-debrebase work)\n" msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" -#: ../git-debrebase:2293 +#: ../git-debrebase:2292 msgid " stitched\n" msgstr " geborduurd\n" -#: ../git-debrebase:2295 +#: ../git-debrebase:2294 msgid " not git-debrebase (diverged since last stitch)\n" msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" -#: ../git-debrebase:2298 +#: ../git-debrebase:2297 msgid "you are currently rebasing\n" msgstr "u bent momenteel aan het rebasen\n" -#: ../git-debrebase:2315 ../git-debrebase:2328 +#: ../git-debrebase:2314 ../git-debrebase:2327 msgid "launder for git-debrebase quick" msgstr "wassen voor git-debrebase quick" -#: ../git-debrebase:2322 ../git-debrebase:2352 +#: ../git-debrebase:2321 ../git-debrebase:2351 msgid "No ongoing git-debrebase session." msgstr "Geen lopende git-debrebase-sessie." -#: ../git-debrebase:2391 +#: ../git-debrebase:2390 msgid "Commit patch queue (exported by git-debrebase)" msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" -#: ../git-debrebase:2408 +#: ../git-debrebase:2407 msgid "No (more) patches to export." msgstr "Geen (andere) patches die geëxporteerd moeten worden." -#: ../git-debrebase:2415 +#: ../git-debrebase:2414 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " @@ -2476,39 +2455,39 @@ msgstr "" "De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " "gestaakt). Probeer eerst een wasbeurt te doen." -#: ../git-debrebase:2435 +#: ../git-debrebase:2434 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "%s bevat commentaar die verwijderd zal worden" -#: ../git-debrebase:2440 +#: ../git-debrebase:2439 #, perl-format msgid "patch %s repeated in %s !" msgstr "patch %s herhaald in %s !" -#: ../git-debrebase:2447 +#: ../git-debrebase:2446 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" -#: ../git-debrebase:2455 +#: ../git-debrebase:2454 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2460 +#: ../git-debrebase:2459 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2476 +#: ../git-debrebase:2475 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2481 +#: ../git-debrebase:2480 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2497 +#: ../git-debrebase:2496 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2520,12 +2499,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2505 +#: ../git-debrebase:2504 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2512 +#: ../git-debrebase:2511 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2535,47 +2514,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2514 +#: ../git-debrebase:2513 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2521 +#: ../git-debrebase:2520 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2539 +#: ../git-debrebase:2538 msgid "neither of the first two changelog entries are released\n" msgstr "" "geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" -#: ../git-debrebase:2545 +#: ../git-debrebase:2544 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2548 +#: ../git-debrebase:2547 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2551 +#: ../git-debrebase:2550 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2553 +#: ../git-debrebase:2552 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" -#: ../git-debrebase:2555 +#: ../git-debrebase:2554 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2562 +#: ../git-debrebase:2561 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2586,14 +2565,14 @@ msgstr "" "Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" "dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" -#: ../git-debrebase:2608 +#: ../git-debrebase:2607 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" "%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " "(patched-unapplied) (gbp), Oké\n" -#: ../git-debrebase:2637 +#: ../git-debrebase:2636 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2604,17 +2583,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2658 +#: ../git-debrebase:2657 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2666 +#: ../git-debrebase:2665 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2680 +#: ../git-debrebase:2679 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2625,58 +2604,58 @@ msgstr "" "%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" "%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" -#: ../git-debrebase:2684 +#: ../git-debrebase:2683 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2696 +#: ../git-debrebase:2695 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2703 +#: ../git-debrebase:2702 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2709 +#: ../git-debrebase:2708 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2718 +#: ../git-debrebase:2717 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2724 +#: ../git-debrebase:2723 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" -#: ../git-debrebase:2755 +#: ../git-debrebase:2754 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" -#: ../git-debrebase:2764 +#: ../git-debrebase:2763 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2801 +#: ../git-debrebase:2800 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2810 +#: ../git-debrebase:2809 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2824 +#: ../git-debrebase:2823 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -2687,99 +2666,99 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2830 +#: ../git-debrebase:2829 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2837 +#: ../git-debrebase:2836 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2841 +#: ../git-debrebase:2840 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" "Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" -#: ../git-debrebase:2943 +#: ../git-debrebase:2942 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:2953 +#: ../git-debrebase:2952 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:2983 +#: ../git-debrebase:2982 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" -#: ../Debian/Dgit.pm:293 +#: ../Debian/Dgit.pm:296 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:319 +#: ../Debian/Dgit.pm:322 #, perl-format msgid "getcwd failed: %s\n" msgstr "getcwd mislukte: %s\n" -#: ../Debian/Dgit.pm:338 +#: ../Debian/Dgit.pm:341 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:340 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:346 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:347 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:353 +#: ../Debian/Dgit.pm:356 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:361 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:363 +#: ../Debian/Dgit.pm:366 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:454 +#: ../Debian/Dgit.pm:457 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:464 +#: ../Debian/Dgit.pm:467 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:483 +#: ../Debian/Dgit.pm:486 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:489 +#: ../Debian/Dgit.pm:492 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:510 +#: ../Debian/Dgit.pm:513 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -2787,26 +2766,26 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:516 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:621 +#: ../Debian/Dgit.pm:624 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:622 +#: ../Debian/Dgit.pm:625 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:644 +#: ../Debian/Dgit.pm:647 #, fuzzy #| msgid "found mixed upstream/packaging commit" msgid "using specified upstream commitish" msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" -#: ../Debian/Dgit.pm:650 +#: ../Debian/Dgit.pm:653 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2817,25 +2796,25 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef toeleveraar-commitish expliciet op." -#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:764 +#: ../Debian/Dgit.pm:767 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:765 +#: ../Debian/Dgit.pm:768 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:781 +#: ../Debian/Dgit.pm:784 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:790 +#: ../Debian/Dgit.pm:793 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -2844,45 +2823,64 @@ 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:804 +#: ../Debian/Dgit.pm:807 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:825 +#: ../Debian/Dgit.pm:828 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:914 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:932 +#: ../Debian/Dgit.pm:935 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:1000 +#: ../Debian/Dgit.pm:1003 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:1023 +#: ../Debian/Dgit.pm:1026 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:1031 +#: ../Debian/Dgit.pm:1034 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:1040 +#: ../Debian/Dgit.pm:1043 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" +#~ msgid "failed to fetch %s: %s" +#~ msgstr "ophalen (fetch) van %s mislukt: %s" + +#~ msgid "" +#~ "config requested specific TLS key but do not know how to get curl to use " +#~ "exactly that EE key (%s)" +#~ msgstr "" +#~ "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe " +#~ "curl ertoe te brengen exact die EE-sleutel (%s) te gebruiken" + +#~ msgid "curl failed to print 3-digit HTTP code" +#~ msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" + +#~ msgid "unexpected results from git check query - " +#~ msgstr "het verzoek git check leverde onverwachte resultaten op - " + +#~ msgid "exec curl: %s\n" +#~ msgstr "exec curl: %s\n" + #~ msgid "Import %s" #~ msgstr "Importeren van %s" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 2e5c3898..3d6de787 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-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-08-10 19:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -956,7 +956,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:462 +#: ../dgit.1:496 ../git-debrebase.1.pod:476 #, no-wrap msgid "OPTIONS" msgstr "" @@ -2283,14 +2283,28 @@ msgid "" "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" +#. type: TP +#: ../dgit.1:1330 +#, no-wrap +msgid "B<--for-push>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1336 +msgid "" +"Override the dgit-distro.distro.readonly configuration setting, to specify " +"that we have read/write access and should use the corresponding git and " +"achive access approach even if the operation is a read-only one." +msgstr "" + #. type: =head1 -#: ../dgit.1:1330 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1336 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1342 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<-" @@ -2298,31 +2312,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1338 +#: ../dgit.1:1344 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1338 +#: ../dgit.1:1344 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:1344 +#: ../dgit.1:1350 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:1344 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1350 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "BIB<.distro> I" msgstr "" #. type: Plain text -#: ../dgit.1:1349 +#: ../dgit.1:1355 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 " @@ -2330,66 +2344,66 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1352 +#: ../dgit.1:1358 msgid "I may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1352 +#: ../dgit.1:1358 #, no-wrap msgid "BI< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1355 +#: ../dgit.1:1361 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1355 +#: ../dgit.1:1361 #, no-wrap msgid "BI< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1364 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1358 +#: ../dgit.1:1364 #, no-wrap msgid "B*" msgstr "" #. type: Plain text -#: ../dgit.1:1363 +#: ../dgit.1:1369 msgid "" "for each BIB<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1363 +#: ../dgit.1:1369 #, no-wrap msgid "BIB<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1367 +#: ../dgit.1:1373 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1367 +#: ../dgit.1:1373 #, no-wrap msgid "BIB<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1373 +#: ../dgit.1:1379 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 " @@ -2397,45 +2411,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1373 +#: ../dgit.1:1379 #, no-wrap msgid "BIB<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1383 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1383 #, no-wrap msgid "BIB<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1385 #, no-wrap msgid "BIB<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1383 +#: ../dgit.1:1389 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:1383 +#: ../dgit.1:1389 #, no-wrap msgid "BIB<.readonly> B|B | B|B|B|B<1> | B|B|B|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1390 +#: ../dgit.1:1396 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, " @@ -2444,52 +2458,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1390 +#: ../dgit.1:1396 #, no-wrap msgid "BIB<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1394 +#: ../dgit.1:1400 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1394 +#: ../dgit.1:1400 #, no-wrap msgid "BIB<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1402 #, no-wrap msgid "BIB<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1399 +#: ../dgit.1:1405 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1399 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1405 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "BIB<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1402 +#: ../dgit.1:1408 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1408 #, no-wrap msgid "BIB<.user-name>I< >BIB<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1407 +#: ../dgit.1:1413 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, " @@ -2497,26 +2511,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1413 #, no-wrap msgid "BIB<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1411 +#: ../dgit.1:1417 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:1411 +#: ../dgit.1:1417 #, no-wrap msgid "BIB<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1416 +#: ../dgit.1:1422 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2524,13 +2538,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1422 #, no-wrap msgid "BIB<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1422 +#: ../dgit.1:1428 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2538,24 +2552,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1428 #, no-wrap msgid "BIB<.cmd->I" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1434 msgid "Program to use instead of I. Works like B<-->IB<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1434 #, no-wrap msgid "BIB<.opts->I" msgstr "" #. type: Plain text -#: ../dgit.1:1440 +#: ../dgit.1:1446 msgid "" "Extra options to pass to I. Works like B<-->IB<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2565,13 +2579,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1440 +#: ../dgit.1:1446 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1445 +#: ../dgit.1:1451 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2580,204 +2594,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1445 +#: ../dgit.1:1451 #, no-wrap msgid "BIB<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1448 +#: ../dgit.1:1454 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1448 +#: ../dgit.1:1454 #, no-wrap msgid "BIB<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1451 +#: ../dgit.1:1457 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1451 +#: ../dgit.1:1457 #, no-wrap msgid "BIB*" msgstr "" #. type: Plain text -#: ../dgit.1:1457 +#: ../dgit.1:1463 msgid "" "If set, overrides corresponding non B config when B, " "or when pushing and B." msgstr "" #. type: TP -#: ../dgit.1:1457 +#: ../dgit.1:1463 #, no-wrap msgid "BIB<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1459 +#: ../dgit.1:1465 #, no-wrap msgid "BIB<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1461 +#: ../dgit.1:1467 #, no-wrap msgid "BIB<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1463 +#: ../dgit.1:1469 #, no-wrap msgid "BIB<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1465 +#: ../dgit.1:1471 #, no-wrap msgid "BIB<.git-check> B|B|B|B" msgstr "" #. type: TP -#: ../dgit.1:1467 +#: ../dgit.1:1473 #, no-wrap msgid "BIB<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1469 +#: ../dgit.1:1475 #, no-wrap msgid "BIB<.diverts.divert> B|BI" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1477 #, no-wrap msgid "BIB<.git-create>I< >BI<|>B" msgstr "" #. type: TP -#: ../dgit.1:1473 +#: ../dgit.1:1479 #, no-wrap msgid "BIB<.archive-query> B | BI | BI | BIB<@>IB<:>IB< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1475 +#: ../dgit.1:1481 #, no-wrap msgid "BIB<.archive-query->(B|B|B)" msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1483 #, no-wrap msgid "BIB<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1479 +#: ../dgit.1:1485 #, no-wrap msgid "BIB<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1481 +#: ../dgit.1:1487 #, no-wrap msgid "BIB<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1483 +#: ../dgit.1:1489 #, no-wrap msgid "BIB<.dep14tag> B|B[|B]" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1491 #, no-wrap msgid "BIB<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1493 #, no-wrap msgid "BIB<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1495 #, no-wrap msgid "BIB<.>(B|B)B<->(B|B|B)" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1497 #, no-wrap msgid "BIB<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1493 +#: ../dgit.1:1499 #, no-wrap msgid "BIB<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1501 #, no-wrap msgid "BIB<.source-only-uploads> B|B|B|B" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1503 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1505 #, no-wrap msgid "BI" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1507 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1503 +#: ../dgit.1:1509 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1511 #, no-wrap msgid "B I[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1507 +#: ../dgit.1:1513 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1508 +#: ../dgit.1:1514 #, no-wrap msgid "B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1517 +#: ../dgit.1:1523 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2787,26 +2801,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1517 +#: ../dgit.1:1523 #, no-wrap msgid "B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1521 +#: ../dgit.1:1527 msgid "" "Default git user.email and user.name for new trees. See B." msgstr "" #. type: TP -#: ../dgit.1:1521 +#: ../dgit.1:1527 #, no-wrap -msgid "B, B..., B, B, B, B, B" +msgid "B, B..., B, B, [B]B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1526 +#: ../dgit.1:1532 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2814,13 +2828,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1526 +#: ../dgit.1:1532 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1533 +#: ../dgit.1:1539 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 " @@ -2828,7 +2842,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1539 +#: ../dgit.1:1545 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 " @@ -2836,7 +2850,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1544 +#: ../dgit.1:1550 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 " @@ -2845,7 +2859,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1549 +#: ../dgit.1:1555 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-" @@ -2853,25 +2867,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1555 ../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 "" #. type: Plain text -#: ../dgit.1:1558 +#: ../dgit.1:1564 msgid "" "B(7), B(7), B(1), B(1), B(1), B(1), B(1), B(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1559 +#: ../dgit.1:1565 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 8c08286f..af63d4e0 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-08-10 19:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,34 +28,27 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:462 +#: ../dgit.1:496 ../git-debrebase.1.pod:476 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1555 ../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 "" -#. type: =head1 -#: ../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 -msgid "INTRODUCTION" -msgstr "" - #. type: textblock #: ../git-debrebase.1.pod:3 -msgid "git-debrebase - delta queue rebase tool for Debian packaging" +msgid "" +"git-debrebase - tool to maintain series of Debian changes to upstream source" msgstr "" #. type: =head1 @@ -72,59 +65,95 @@ msgid "" "\n" msgstr "" +#. type: =head1 +#: ../git-debrebase.1.pod:10 +msgid "QUICK REFERENCE" +msgstr "" + #. type: textblock -#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 +#: ../git-debrebase.1.pod:12 +msgid "These are most of the commands you will regularly need:" +msgstr "" + +#. type: verbatim +#: ../git-debrebase.1.pod:14 +#, no-wrap msgid "" -"git-debrebase is a tool for representing in git, and manpulating, Debian " -"packages based on upstream source code." +" git debrebase -i # edit the patch queue\n" +" git debrebase conclude && git push # push to eg salsa\n" +" git debrebase conclude && dgit push-source # source-only upload\n" +" git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n" +" dpkg-buildpackage -uc -b # get test debs, at any time\n" +"\n" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:20 +msgid "" +"To add patches, or edit the packaging, just make git commits. Ignore " +"anything that may appear in debian/patches. Avoid using \"git pull\" and " +"\"git merge\" without \"--ff-only\"." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:24 +msgid "" +"git-debrebase has a special branch format, so see \"CONVERTING AN EXISTING " +"PACKAGE\" in L." +msgstr "" + +#. type: =head1 +#: ../git-debrebase.1.pod:27 +msgid "GUIDE TO DOCUMENTATION" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:16 +#: ../git-debrebase.1.pod:29 msgid "" -"This is the command line reference. Please read the tutorial L. For background, theory of operation, and definitions see " +"This is the command line reference. There is also a detailed workflow " +"tutorial at L (on which the above \"QUICK REFERENCE" +"\" is based). For background, theory of operation, and definitions see " "L." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:22 +#: ../git-debrebase.1.pod:36 msgid "" "You should read this manpage in conjunction with L, which defines many important terms used here." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:26 +#: ../git-debrebase.1.pod:40 msgid "PRINCIPAL OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:30 +#: ../git-debrebase.1.pod:44 msgid "git-debrebase [-- ]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:32 +#: ../git-debrebase.1.pod:46 msgid "git-debrebase [-i ]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:34 +#: ../git-debrebase.1.pod:48 msgid "" "Unstitches and launders the branch. (See L " "below.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:37 +#: ../git-debrebase.1.pod:51 msgid "" "Then, if any git-rebase options were supplied, edits the Debian delta queue, " "using git-rebase, by running" msgstr "" #. type: verbatim -#: ../git-debrebase.1.pod:41 +#: ../git-debrebase.1.pod:55 #, no-wrap msgid "" " git rebase \n" @@ -132,7 +161,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:43 +#: ../git-debrebase.1.pod:57 msgid "" "Do not pass a base branch argument: git-debrebase will supply that. Do not " "use --onto, or --fork-point. Useful git-rebase options include -i and --" @@ -140,7 +169,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:48 +#: ../git-debrebase.1.pod:62 msgid "" "If git-rebase stops for any reason, you may git-rebase --abort, --continue, " "or --skip, as usual. If you abort the git-rebase, the branch will still " @@ -148,14 +177,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:54 +#: ../git-debrebase.1.pod:68 msgid "" "The options for git-rebase must either start with C<-i>, or be prececded by " "C<-->, to distinguish them from options for git-debrebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:58 +#: ../git-debrebase.1.pod:72 msgid "" "It is hazardous to use plain git-rebase on a git-debrebase branch, because " "git-rebase has a tendency to start the rebase too far back in history, and " @@ -163,19 +192,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:64 +#: ../git-debrebase.1.pod:78 msgid "git-debrebase status" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:66 +#: ../git-debrebase.1.pod:80 msgid "" "Analyses the current branch, both in terms of its contents, and the refs " "which are relevant to git-debrebase, and prints a human-readable summary." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:71 +#: ../git-debrebase.1.pod:85 msgid "" "Please do not attempt to parse the output; it may be reformatted or " "reorganised in the future. Instead, use one of the L]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:98 +#: ../git-debrebase.1.pod:112 msgid "If the branch is unstitched, stitches it, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:102 +#: ../git-debrebase.1.pod:116 msgid "" "This is a good command to run before pushing to a git server. You should " "consider using B instead, because that launders the branch too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:106 +#: ../git-debrebase.1.pod:120 msgid "git-debrebase stitch [--prose=]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:108 +#: ../git-debrebase.1.pod:122 msgid "Stitches the branch, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:111 +#: ../git-debrebase.1.pod:125 msgid "If there is no ffq-prev, it is an error, unless --noop-ok." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:113 +#: ../git-debrebase.1.pod:127 msgid "You should consider using B or B instead." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:115 +#: ../git-debrebase.1.pod:129 msgid "git-debrebase scrap" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:117 +#: ../git-debrebase.1.pod:131 msgid "" "Throws away all the work since the branch was last stitched. This is done " "by rewinding you to ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:120 +#: ../git-debrebase.1.pod:134 msgid "If you are in the middle of a git-rebase, will abort that too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:122 +#: ../git-debrebase.1.pod:136 msgid "git-debrebase new-upstream [...]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:124 +#: ../git-debrebase.1.pod:138 msgid "Rebases the delta queue onto a new upstream version. In detail:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:127 +#: ../git-debrebase.1.pod:141 msgid "" "Firstly, checks that the proposed rebase seems to make sense: It is a snag " "unless the new upstream(s) are fast forward from the previous upstream(s) " @@ -293,12 +322,12 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:135 +#: ../git-debrebase.1.pod:149 msgid "If all seems well, unstitches and launders the branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:137 +#: ../git-debrebase.1.pod:151 msgid "" "Then, generates (in a private working area) a new anchor merge commit, on " "top of the breakwater tip, and on top of that a commit to update the version " @@ -306,26 +335,26 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:145 +#: ../git-debrebase.1.pod:159 msgid "Finally, starts a git-rebase of the delta queue onto these new commits." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:149 +#: ../git-debrebase.1.pod:163 msgid "" "That git-rebase may complete successfully, or it may require your " "assistance, just like a normal git-rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:153 +#: ../git-debrebase.1.pod:167 msgid "" "If you git-rebase --abort, the whole new upstream operation is aborted, " "except for the laundering." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:157 +#: ../git-debrebase.1.pod:171 msgid "" " may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " @@ -333,17 +362,17 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:163 +#: ../git-debrebase.1.pod:177 msgid "The are, optionally, in order:" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:167 +#: ../git-debrebase.1.pod:181 msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:169 +#: ../git-debrebase.1.pod:183 msgid "" "The new upstream branch (or commit-ish). The default is to look for one of " "these tags, in this order: U vU upstream/U; where U is the new upstream " @@ -351,7 +380,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:175 +#: ../git-debrebase.1.pod:189 msgid "" "It is a snag if the upstream contains a debian/ directory; if forced to " "proceed, git-debrebase will disregard the upstream's debian/ and take (only) " @@ -359,17 +388,17 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:180 +#: ../git-debrebase.1.pod:194 msgid " " msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:182 +#: ../git-debrebase.1.pod:196 msgid "Specifies that this is a multi-piece upstream. May be repeated." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:185 +#: ../git-debrebase.1.pod:199 msgid "" "When such a pair is specified, git-debrebase will first combine the pieces " "of the upstream together, and then use the result as the combined new " @@ -377,7 +406,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:190 +#: ../git-debrebase.1.pod:204 msgid "" "For each , the tree of the becomes " "the subdirectory in the combined new upstream (supplanting any " @@ -385,14 +414,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:197 +#: ../git-debrebase.1.pod:211 msgid "" " has a restricted syntax: it may contain only ASCII " "alphanumerics and hyphens." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:200 +#: ../git-debrebase.1.pod:214 msgid "" "The combined upstream is itself recorded as a commit, with each of the " "upstream pieces' commits as parents. The combined commit contains an " @@ -401,24 +430,24 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:206 +#: ../git-debrebase.1.pod:220 msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:208 +#: ../git-debrebase.1.pod:222 msgid "These will be passed to git rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:210 +#: ../git-debrebase.1.pod:224 msgid "" "If the upstream rebase is troublesome, -i may be helpful. As with plain git-" "debrebase, do not specify a base, or --onto, or --fork-point." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:216 +#: ../git-debrebase.1.pod:230 msgid "" "If you are planning to generate a .dsc, you will also need to have, or " "generate, actual orig tarball(s), which must be identical to the rev-" @@ -429,19 +458,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:227 +#: ../git-debrebase.1.pod:241 msgid "git-debrebase make-patches [--quiet-would-amend]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:229 +#: ../git-debrebase.1.pod:243 msgid "" "Generate patches in debian/patches/ representing the changes made to " "upstream files." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:232 +#: ../git-debrebase.1.pod:246 msgid "" "It is not normally necessary to run this command explicitly. When uploading " "to Debian, dgit and git-debrebase will cooperate to regenerate patches as " @@ -449,7 +478,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:239 +#: ../git-debrebase.1.pod:253 msgid "" "Normally git-debrebase make-patches will require a laundered branch. (A " "laundered branch does not contain any patches.) But if there are already " @@ -459,7 +488,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:248 +#: ../git-debrebase.1.pod:262 msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " @@ -469,53 +498,53 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:257 +#: ../git-debrebase.1.pod:271 msgid "git-debrebase convert-from-unapplied []" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:259 +#: ../git-debrebase.1.pod:273 msgid "git-debrebase convert-from-gbp []" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:261 +#: ../git-debrebase.1.pod:275 msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:267 +#: ../git-debrebase.1.pod:281 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:271 +#: ../git-debrebase.1.pod:285 msgid "" "a patches-unapplied git packaging branch containing debian/patches, as used " "with quilt" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:276 +#: ../git-debrebase.1.pod:290 msgid "" "a git branch for a package which has no Debian delta - ie where upstream " "files are have not been modified in Debian, so there are no patches" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:282 +#: ../git-debrebase.1.pod:296 msgid "(These two commands operate identically and are simply aliases.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:284 +#: ../git-debrebase.1.pod:298 msgid "" "The conversion is done by generating a new anchor merge, converting any " "quilt patches as a delta queue, and dropping the patches from the tree." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:288 +#: ../git-debrebase.1.pod:302 msgid "" "The upstream commit-ish should correspond to the upstream branch or tag, if " "there is one. It is a snag if it is not an ancestor of HEAD, or if the " @@ -525,7 +554,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:296 +#: ../git-debrebase.1.pod:310 msgid "" "It is also a snag if the specified upstream has a debian/ subdirectory. " "This check exists to detect certain likely user errors, but if this " @@ -533,7 +562,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:302 +#: ../git-debrebase.1.pod:316 msgid "" "git-debrebase will try to look for the dgit archive view of the most recent " "release, and if it finds it will make a pseduomerge so that your new git-" @@ -541,14 +570,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:307 +#: ../git-debrebase.1.pod:321 msgid "" "The result is a well-formed git-debrebase interchange branch. The result is " "also fast-forward from the original branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:310 +#: ../git-debrebase.1.pod:324 msgid "" "It is a snag if the new branch looks like it will have diverged, just as for " "a laundering/unstitching call to git-debrebase; See L, but does not launder the branch or move HEAD." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:353 +#: ../git-debrebase.1.pod:367 msgid "" "It is an error if the ffq-prev could not be recorded. It is also an error " "if an ffq-prev has already been recorded, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:357 +#: ../git-debrebase.1.pod:371 msgid "git-debrebase launder-v0" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:359 +#: ../git-debrebase.1.pod:373 msgid "" "Launders the branch without recording anything in ffq-prev. Then prints " "some information about the current branch. Do not use this operation; it " @@ -637,12 +666,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:364 +#: ../git-debrebase.1.pod:378 msgid "git-debrebase convert-to-gbp" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:366 +#: ../git-debrebase.1.pod:380 msgid "" "Converts a laundered branch into a gbp patches-unapplied branch containing " "quilt patches. The result is not fast forward from the interchange branch, " @@ -650,7 +679,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:371 +#: ../git-debrebase.1.pod:385 msgid "" "This is provided mostly for the test suite and for unusual situations. It " "should only be used with care and with a proper understanding of the " @@ -658,19 +687,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:376 +#: ../git-debrebase.1.pod:390 msgid "" "Be sure to not accidentally treat the result as a git-debrebase branch, or " "you will drop all the patches!" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:380 +#: ../git-debrebase.1.pod:394 msgid "git-debrebase convert-from-dgit-view [] [upstream]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:382 +#: ../git-debrebase.1.pod:396 msgid "" "Converts any dgit-compatible git branch corresponding to a (possibly " "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " @@ -678,7 +707,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:386 +#: ../git-debrebase.1.pod:400 msgid "" "This operation should not be used if the branch is already in git-debrebase " "form. Normally git-debrebase will refuse to continue in this case (or " @@ -686,7 +715,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:391 +#: ../git-debrebase.1.pod:405 msgid "" "Some representation of the original upstream source code will be needed. If " "I is supplied, that must be a suitable upstream commit. By " @@ -695,7 +724,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:397 +#: ../git-debrebase.1.pod:411 msgid "" "The upstream source must be exactly right and all the patches in debian/" "patches must be up to date. Applying the patches from debian/patches to the " @@ -703,7 +732,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:402 +#: ../git-debrebase.1.pod:416 msgid "" "The output is laundered and stitched. The resulting history is not " "particularly pretty, especially if orig tarball(s) were imported to produce " @@ -711,31 +740,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:407 +#: ../git-debrebase.1.pod:421 msgid "" "The available convert-options are as follows. (These must come after " "convert-from-dgit-view.)" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:412 +#: ../git-debrebase.1.pod:426 msgid "--[no-]diagnose" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:414 +#: ../git-debrebase.1.pod:428 msgid "" "Print additional error messages to help diagnose failure to find an " "appropriate upstream. --no-diagnose is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:418 +#: ../git-debrebase.1.pod:432 msgid "--build-products-dir" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:420 +#: ../git-debrebase.1.pod:434 msgid "" "Directory to look in for orig tarballs. The default is the git config " "option dgit.default.build-products-dir or failing that, C<..>. Passed on to " @@ -743,35 +772,35 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:426 +#: ../git-debrebase.1.pod:440 msgid "--[no-]origs" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:428 +#: ../git-debrebase.1.pod:442 msgid "" "Whether to try to look for or use any orig tarballs. --origs is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:431 +#: ../git-debrebase.1.pod:445 msgid "--[no-]tags" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:433 +#: ../git-debrebase.1.pod:447 msgid "" "Whether to try to look for or use any upstream git tags. --tags is the " "default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:436 +#: ../git-debrebase.1.pod:450 msgid "--always-convert-anyway" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:438 +#: ../git-debrebase.1.pod:452 msgid "" "Perform the conversion operation, producing unpleasant extra history, even " "if the branch seems to be in git-debrebase form already. This should not be " @@ -779,12 +808,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:446 +#: ../git-debrebase.1.pod:460 msgid "git-debrebase forget-was-ever-debrebase" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:448 +#: ../git-debrebase.1.pod:462 msgid "" "Deletes the ffq-prev and debrebase-last refs associated with this branch, " "that git-debrebase and dgit use to determine whether this branch is managed " @@ -792,19 +821,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:454 +#: ../git-debrebase.1.pod:468 msgid "" "This can be useful if you were just playing with git-debrebase, and have " "used git-reset --hard to go back to a commit before your experiments." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:458 +#: ../git-debrebase.1.pod:472 msgid "Do not use this if you expect to run git-debrebase on the branch again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:464 +#: ../git-debrebase.1.pod:478 msgid "" "This section documents the general options to git-debrebase (ie, the ones " "which immediately follow git-debrebase or git debrebase on the command " @@ -813,78 +842,78 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:476 +#: ../git-debrebase.1.pod:490 msgid "-f" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:478 +#: ../git-debrebase.1.pod:492 msgid "Turns snag(s) with id into warnings." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:480 +#: ../git-debrebase.1.pod:494 msgid "" "Some troublesome things which git-debrebase encounters are Bs. (The " "specific instances are discussed in the text for the relevant operation.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:485 +#: ../git-debrebase.1.pod:499 msgid "" "When a snag is detected, a message is printed to stderr containing the snag " "id (in the form C<-f>), along with some prose." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:490 +#: ../git-debrebase.1.pod:504 msgid "" "If snags are detected, git-debrebase does not continue, unless the relevant -" "f is specified, or --force is specified." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:494 +#: ../git-debrebase.1.pod:508 msgid "--force" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:496 +#: ../git-debrebase.1.pod:510 msgid "Turns all snags into warnings. See the -f option." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:499 +#: ../git-debrebase.1.pod:513 msgid "" "Do not invoke git-debrebase --force in scripts and aliases; instead, specify " "the particular -f for expected snags." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:502 +#: ../git-debrebase.1.pod:516 msgid "--noop-ok" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:504 +#: ../git-debrebase.1.pod:518 msgid "" "Suppresses the error in some situations where git-debrebase does nothing, " "because there is nothing to do." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:508 +#: ../git-debrebase.1.pod:522 msgid "" "The specific instances are discussed in the text for the relvant operation." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:511 +#: ../git-debrebase.1.pod:525 msgid "--anchor=" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:513 +#: ../git-debrebase.1.pod:527 msgid "" "Treats as an anchor. This overrides the usual logic which " "automatically classifies commits as anchors, pseudomerges, delta queue " @@ -892,7 +921,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:517 +#: ../git-debrebase.1.pod:531 msgid "" "It also disables some coherency checks which depend on metadata extracted " "from its commit message, so it is a snag if is the anchor for " @@ -900,41 +929,41 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:524 +#: ../git-debrebase.1.pod:538 msgid "--dgit=" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:526 +#: ../git-debrebase.1.pod:540 msgid "" "Run , instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:530 +#: ../git-debrebase.1.pod:544 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:532 +#: ../git-debrebase.1.pod:546 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:534 +#: ../git-debrebase.1.pod:548 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:536 +#: ../git-debrebase.1.pod:550 msgid "" "Enable experimental code for handling general merges (see L)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:539 +#: ../git-debrebase.1.pod:553 msgid "" "This option may generate lossage of various kinds, including misleading " "error messages, references to nonexistent documentation, and you being " @@ -942,24 +971,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:547 +#: ../git-debrebase.1.pod:561 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:549 +#: ../git-debrebase.1.pod:563 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:552 +#: ../git-debrebase.1.pod:566 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:554 +#: ../git-debrebase.1.pod:568 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -967,30 +996,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:566 +#: ../git-debrebase.1.pod:580 msgid "" "The branch that git would merge from (remote..merge, remote.." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:571 +#: ../git-debrebase.1.pod:585 msgid "" "The branch git would push to, if different (remote..pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:576 +#: ../git-debrebase.1.pod:590 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:581 +#: ../git-debrebase.1.pod:595 msgid "If you are on C, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:586 +#: ../git-debrebase.1.pod:600 msgid "" "The apparently relevant ref names to check are filtered through branch." ".ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -998,7 +1027,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:591 +#: ../git-debrebase.1.pod:605 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -1007,31 +1036,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:597 +#: ../git-debrebase.1.pod:611 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:601 +#: ../git-debrebase.1.pod:615 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:603 +#: ../git-debrebase.1.pod:617 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:608 +#: ../git-debrebase.1.pod:622 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:610 +#: ../git-debrebase.1.pod:624 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1039,13 +1068,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:616 +#: ../git-debrebase.1.pod:630 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:621 +#: ../git-debrebase.1.pod:635 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index dd072906..91ac1c8c 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-07-21 01:37+0100\n" +"POT-Creation-Date: 2019-08-10 19:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,13 +28,13 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1555 ../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 "" @@ -53,15 +53,15 @@ msgid "TERMINOLOGY" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 -msgid "" -"git-debrebase is a tool for representing in git, and manpulating, Debian " -"packages based on upstream source code." +#: ../git-debrebase.5.pod:3 +msgid "git-debrebase - git data model for Debian packaging" msgstr "" #. type: textblock -#: ../git-debrebase.5.pod:3 -msgid "git-debrebase - git data model for Debian packaging" +#: ../git-debrebase.5.pod:7 +msgid "" +"git-debrebase is a tool for representing in git, and manpulating, Debian " +"packages based on upstream source code." msgstr "" #. type: textblock -- 2.30.2