From ffb9335e93d9c539dd61e62cf1ebcd834e363d72 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Jul 2019 01:37:03 +0100 Subject: [PATCH] i18n-commit - autogenerated --- po/en_US.po | 1500 +++++++++-------------- po/messages.pot | 1523 +++++++++-------------- po/nl.po | 1993 +++++++++++++++---------------- po4a/dgit-maint-debrebase_7.pot | 387 +++--- po4a/dgit-maint-merge_7.pot | 258 ++-- po4a/dgit_1.pot | 659 +++++----- po4a/dgit_7.pot | 102 +- po4a/git-debrebase_1.pot | 22 +- po4a/git-debrebase_5.pot | 30 +- 9 files changed, 3021 insertions(+), 3453 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index b0e64d47..e8cd03f5 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"POT-Creation-Date: 2019-07-21 00:36+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -17,78 +17,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:242 +#: ../dgit:264 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:249 +#: ../dgit:271 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:257 +#: ../dgit:279 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:262 +#: ../dgit:284 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:487 +#: ../dgit:516 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:492 ../dgit:498 +#: ../dgit:521 ../dgit:527 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:493 +#: ../dgit:522 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:501 +#: ../dgit:530 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:508 +#: ../dgit:537 msgid "protocol message" msgstr "" -#: ../dgit:516 +#: ../dgit:545 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:537 +#: ../dgit:566 msgid "bad byte count" msgstr "" -#: ../dgit:540 +#: ../dgit:569 msgid "data block" msgstr "" -#: ../dgit:621 +#: ../dgit:650 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:633 +#: ../dgit:662 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:635 +#: ../dgit:664 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:660 +#: ../dgit:689 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +109,153 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:679 +#: ../dgit:708 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:683 +#: ../dgit:712 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:688 +#: ../dgit:717 msgid "too few arguments" msgstr "" -#: ../dgit:799 +#: ../dgit:833 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:802 +#: ../dgit:836 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:822 +#: ../dgit:856 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:863 +#: ../dgit:897 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:878 +#: ../dgit:912 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:894 +#: ../dgit:928 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:914 +#: ../dgit:948 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:966 +#, perl-format +msgid "unknown %s `%s'" +msgstr "" + +#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 msgid "internal error" msgstr "" -#: ../dgit:925 +#: ../dgit:973 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:929 +#: ../dgit:977 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1094 +#: ../dgit:1000 +#, perl-format +msgid "" +"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " +"set to `%s'" +msgstr "" + +#: ../dgit:1163 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1140 +#: ../dgit:1209 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1161 +#: ../dgit:1230 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1169 +#: ../dgit:1238 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1173 +#: ../dgit:1242 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1189 +#: ../dgit:1258 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1193 +#: ../dgit:1262 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1195 +#: ../dgit:1264 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1197 +#: ../dgit:1266 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1199 ../dgit:1224 +#: ../dgit:1268 ../dgit:1293 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1213 +#: ../dgit:1282 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1215 +#: ../dgit:1284 msgid "bad component" msgstr "" -#: ../dgit:1218 +#: ../dgit:1287 msgid "bad filename" msgstr "" -#: ../dgit:1220 +#: ../dgit:1289 msgid "bad sha256sum" msgstr "" -#: ../dgit:1271 +#: ../dgit:1340 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1355 +#: ../dgit:1424 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +263,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1377 +#: ../dgit:1448 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1405 +#: ../dgit:1474 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1406 +#: ../dgit:1475 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1511 +#: ../dgit:1580 #, 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:1702 +#: ../dgit:1719 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1705 +#: ../dgit:1722 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1707 +#: ../dgit:1724 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1727 +#: ../dgit:1744 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1733 +#: ../dgit:1750 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1760 +#: ../dgit:1777 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1777 +#: ../dgit:1794 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1792 +#: ../dgit:1809 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1807 +#: ../dgit:1824 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1844 +#: ../dgit:1861 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1890 +#: ../dgit:1907 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1901 +#: ../dgit:1918 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1947 +#: ../dgit:1964 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1956 +#: ../dgit:1973 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1960 +#: ../dgit:1977 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1966 +#: ../dgit:1983 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2006 +#: ../dgit:2023 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2019 +#: ../dgit:2036 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2032 +#: ../dgit:2049 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2048 +#: ../dgit:2065 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2053 +#: ../dgit:2070 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2061 +#: ../dgit:2078 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2068 +#: ../dgit:2085 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2096 +#: ../dgit:2113 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2104 +#: ../dgit:2121 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2107 +#: ../dgit:2124 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2131 +#: ../dgit:2143 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2154 +#: ../dgit:2166 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +434,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2166 +#: ../dgit:2178 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2197 +#: ../dgit:2209 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2199 +#: ../dgit:2211 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2201 +#: ../dgit:2213 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2206 +#: ../dgit:2218 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2243 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2235 +#: ../dgit:2247 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2237 +#: ../dgit:2249 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2240 +#: ../dgit:2252 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2249 +#: ../dgit:2261 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2253 +#: ../dgit:2265 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2256 +#: ../dgit:2268 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2262 +#: ../dgit:2274 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2294 ../dgit:2299 -#, perl-format -msgid "accessing %s: %s" -msgstr "" - -#: ../dgit:2314 ../dgit:2321 -#, perl-format -msgid "saving %s: %s" -msgstr "" - -#: ../dgit:2386 +#: ../dgit:2345 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2450 ../dgit:5974 -msgid "source package" -msgstr "" - -#: ../dgit:2468 +#: ../dgit:2407 msgid "package changelog" msgstr "" -#: ../dgit:2508 +#: ../dgit:2447 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2527 +#: ../dgit:2516 ../dgit:2521 #, perl-format -msgid "Import %s" +msgid "accessing %s: %s" msgstr "" -#: ../dgit:2608 +#: ../dgit:2536 ../dgit:2543 +#, perl-format +msgid "saving %s: %s" +msgstr "" + +#: ../dgit:2569 ../dgit:6035 +msgid "source package" +msgstr "" + +#: ../dgit:2647 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2627 +#: ../dgit:2666 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2636 +#: ../dgit:2675 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +544,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2651 +#: ../dgit:2690 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2655 +#: ../dgit:2694 msgid "Import of source package" msgstr "" -#: ../dgit:2668 -#, perl-format -msgid "Record %s (%s) in archive suite %s\n" -msgstr "" - -#: ../dgit:2672 +#: ../dgit:2714 #, perl-format msgid "" "\n" @@ -560,51 +562,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2714 +#: ../dgit:2756 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2718 +#: ../dgit:2760 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2722 +#: ../dgit:2764 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2738 +#: ../dgit:2780 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2833 +#: ../dgit:2875 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2848 +#: ../dgit:2890 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2892 +#: ../dgit:2934 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2907 +#: ../dgit:2949 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:2912 +#: ../dgit:2954 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +616,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2979 -#, perl-format -msgid "Not updating %s from %s to %s.\n" -msgstr "" - -#: ../dgit:3028 -#, perl-format -msgid "%s: NO git hash" -msgstr "" - -#: ../dgit:3032 -#, perl-format -msgid "%s: specified git info (%s)" -msgstr "" - -#: ../dgit:3039 -#, perl-format -msgid "%s: specified git hash" -msgstr "" - -#: ../dgit:3041 -#, perl-format -msgid "%s: invalid Dgit info" -msgstr "" - -#: ../dgit:3063 +#: ../dgit:3101 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3068 +#: ../dgit:3106 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3073 +#: ../dgit:3111 #, 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:3083 +#: ../dgit:3121 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +642,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3103 +#: ../dgit:3141 msgid "rewrite map" msgstr "" -#: ../dgit:3110 +#: ../dgit:3148 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3114 +#: ../dgit:3152 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3116 +#: ../dgit:3154 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3123 +#: ../dgit:3161 msgid "additional commits" msgstr "" -#: ../dgit:3126 +#: ../dgit:3164 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3151 +#: ../dgit:3189 msgid "last upload to archive" msgstr "" -#: ../dgit:3155 +#: ../dgit:3193 msgid "no version available from the archive" msgstr "" -#: ../dgit:3238 +#: ../dgit:3276 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3245 +#: ../dgit:3283 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3250 +#: ../dgit:3288 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3278 +#: ../dgit:3316 #, perl-format msgid "" "\n" @@ -722,15 +699,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3291 +#: ../dgit:3329 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3294 +#: ../dgit:3332 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3315 +#: ../dgit:3353 #, perl-format msgid "" "\n" @@ -738,7 +715,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3324 +#: ../dgit:3362 #, perl-format msgid "" "\n" @@ -748,7 +725,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3409 +#: ../dgit:3447 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +733,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3422 +#: ../dgit:3460 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3440 +#: ../dgit:3478 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3442 +#: ../dgit:3480 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3453 +#: ../dgit:3491 #, perl-format msgid "" "\n" @@ -778,30 +755,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3468 +#: ../dgit:3506 msgid "fetched source tree" msgstr "" -#: ../dgit:3504 +#: ../dgit:3542 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3569 +#: ../dgit:3607 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3583 +#: ../dgit:3621 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3598 +#: ../dgit:3636 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3625 +#: ../dgit:3663 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +786,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3647 +#: ../dgit:3685 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3655 +#: ../dgit:3693 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3694 +#: ../dgit:3732 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3726 +#: ../dgit:3764 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3728 +#: ../dgit:3766 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3767 +#: ../dgit:3805 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +817,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3781 +#: ../dgit:3819 msgid "" "\n" "Key\n" @@ -849,613 +826,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3796 +#: ../dgit:3834 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3814 +#: ../dgit:3852 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3822 +#: ../dgit:3860 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3837 +#: ../dgit:3875 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3853 +#: ../dgit:3891 msgid "fetching existing git history" msgstr "" -#: ../dgit:3857 +#: ../dgit:3895 msgid "starting new git history" msgstr "" -#: ../dgit:3883 +#: ../dgit:3921 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3888 +#: ../dgit:3926 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3900 +#: ../dgit:3938 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3902 +#: ../dgit:3940 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3910 +#: ../dgit:3948 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3921 +#: ../dgit:3959 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3940 +#: ../dgit:3978 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3957 +#: ../dgit:3995 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3960 +#: ../dgit:3998 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3964 +#: ../dgit:4002 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4007 +#: ../dgit:4045 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4012 +#: ../dgit:4050 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4022 +#: ../dgit:4060 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4028 +#: ../dgit:4066 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4054 +#: ../dgit:4092 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4057 +#: ../dgit:4095 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4065 +#: ../dgit:4103 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4074 +#: ../dgit:4112 msgid "version currently in archive" msgstr "" -#: ../dgit:4083 +#: ../dgit:4121 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4091 +#: ../dgit:4129 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4101 +#: ../dgit:4140 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4104 +#: ../dgit:4143 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4118 +#: ../dgit:4157 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4174 +#: ../dgit:4213 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4183 +#: ../dgit:4222 msgid "maintainer view tag" msgstr "" -#: ../dgit:4185 +#: ../dgit:4224 msgid "dgit view tag" msgstr "" -#: ../dgit:4186 +#: ../dgit:4225 msgid "current archive contents" msgstr "" -#: ../dgit:4199 +#: ../dgit:4238 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4209 +#: ../dgit:4248 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4249 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4214 +#: ../dgit:4253 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4227 +#: ../dgit:4266 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4235 +#: ../dgit:4274 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4247 +#: ../dgit:4286 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4269 +#: ../dgit:4308 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4330 +#: ../dgit:4362 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4358 -#, perl-format -msgid "%s release %s for %s (%s) [dgit]\n" -msgstr "" - -#: ../dgit:4371 -#, perl-format -msgid "" -"%s release %s for %s (%s)\n" -"(maintainer view tag generated by dgit --quilt=%s)\n" -msgstr "" - -#: ../dgit:4423 -msgid "" -"Push failed, while checking state of the archive.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4432 -msgid "" -"package appears to be new in this suite; if this is intentional, use --new" -msgstr "" - -#: ../dgit:4437 -msgid "" -"Push failed, while preparing your push.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4460 -#, perl-format -msgid "looked for .dsc %s, but %s; maybe you forgot to build" -msgstr "" - -#: ../dgit:4477 -#, perl-format -msgid "" -"Branch is managed by git-debrebase (%s\n" -"exists), but quilt mode (%s) implies a split view.\n" -"Pass the right --quilt option or adjust your git config.\n" -"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" -msgstr "" - -#: ../dgit:4501 -#, perl-format -msgid "" -"--quilt=%s but no cached dgit view:\n" -" perhaps HEAD changed since dgit build[-source] ?" -msgstr "" - -#: ../dgit:4532 -msgid "" -"dgit push: HEAD is not a descendant of the archive's version.\n" -"To overwrite the archive's contents, pass --overwrite[=VERSION].\n" -"To rewind history, if permitted by the archive, use --deliberately-not-fast-" -"forward." -msgstr "" - -#: ../dgit:4542 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "" - -#: ../dgit:4576 ../dgit:4588 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "" - -#: ../dgit:4582 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" - -#: ../dgit:4592 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" - -#: ../dgit:4603 -#, perl-format -msgid "" -"failed to find unique changes file (looked for %s in %s); perhaps you need " -"to use dgit -C" -msgstr "" - -#: ../dgit:4625 -msgid "uploading binaries, although distro policy is source only" -msgstr "" - -#: ../dgit:4629 -msgid "source-only upload, although distro policy requires .debs" -msgstr "" - -#: ../dgit:4633 -#, perl-format -msgid "" -"source-only upload, even though package is entirely NEW\n" -"(this is contrary to policy in %s)" -msgstr "" - -#: ../dgit:4640 -#, perl-format -msgid "unknown source-only-uploads policy `%s'" -msgstr "" - -#: ../dgit:4684 -msgid "" -"Push failed, while signing the tag.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4697 -msgid "" -"Push failed, *after* signing the tag.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" - -#: ../dgit:4714 -msgid "" -"Push failed, while updating the remote git repository - see messages above.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" - -#: ../dgit:4731 -msgid "" -"Push failed, while obtaining signatures on the .changes and .dsc.\n" -"If it was just that the signature failed, you may try again by using\n" -"debsign by hand to sign the changes file (see the command dgit tried,\n" -"above), and then dput that changes file to complete the upload.\n" -"If you need to change the package, you must use a new version number.\n" -msgstr "" - -#: ../dgit:4762 -#, perl-format -msgid "pushed and uploaded %s" -msgstr "" - -#: ../dgit:4774 -msgid "-p is not allowed with clone; specify as argument instead" -msgstr "" - -#: ../dgit:4785 -msgid "incorrect arguments to dgit clone" -msgstr "" - -#: ../dgit:4791 ../git-debrebase:1839 -#, perl-format -msgid "%s already exists" -msgstr "" - -#: ../dgit:4805 -#, perl-format -msgid "remove %s: %s\n" -msgstr "" - -#: ../dgit:4809 -#, perl-format -msgid "check whether to remove %s: %s\n" -msgstr "" - -#: ../dgit:4847 -msgid "incorrect arguments to dgit fetch or dgit pull" -msgstr "" - -#: ../dgit:4864 -#, perl-format -msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" -msgstr "" - -#: ../dgit:4873 -msgid "dgit checkout needs a suite argument" -msgstr "" - -#: ../dgit:4935 -#, perl-format -msgid "setting up vcs-git: %s\n" -msgstr "" - -#: ../dgit:4938 -#, perl-format -msgid "vcs git already configured: %s\n" -msgstr "" - -#: ../dgit:4940 -#, perl-format -msgid "changing vcs-git url to: %s\n" -msgstr "" - -#: ../dgit:4945 -#, perl-format -msgid "fetching (%s)\n" -msgstr "" - -#: ../dgit:4960 -#, perl-format -msgid "incorrect arguments to dgit %s" -msgstr "" - -#: ../dgit:4971 -#, perl-format -msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" -msgstr "" - -#: ../dgit:5009 -#, perl-format -msgid "" -"build host has dgit rpush protocol versions %s but invocation host has %s" -msgstr "" - -#: ../dgit:5089 -#, perl-format -msgid "create %s: %s" -msgstr "" - -#: ../dgit:5126 -#, perl-format -msgid "build host child failed: %s" -msgstr "" - -#: ../dgit:5129 -msgid "all done\n" -msgstr "" - -#: ../dgit:5138 -#, perl-format -msgid "file %s (%s) twice" -msgstr "" - -#: ../dgit:5146 -msgid "bad param spec" -msgstr "" - -#: ../dgit:5152 -msgid "bad previously spec" -msgstr "" - -#: ../dgit:5171 -#, perl-format -msgid "" -"rpush negotiated protocol version %s which does not support quilt mode %s" -msgstr "" - -#: ../dgit:5216 -#, perl-format -msgid "buildinfo mismatch in field %s" -msgstr "" - -#: ../dgit:5219 -#, perl-format -msgid "buildinfo contains forbidden field %s" -msgstr "" - -#: ../dgit:5260 -msgid "remote changes file" -msgstr "" - -#: ../dgit:5335 -msgid "not a plain file or symlink\n" -msgstr "" - -#: ../dgit:5341 -msgid "mode or type changed\n" -msgstr "" - -#: ../dgit:5342 -msgid "modified symlink\n" -msgstr "" - -#: ../dgit:5345 -msgid "deletion of symlink\n" -msgstr "" - -#: ../dgit:5349 -msgid "creation with non-default mode\n" -msgstr "" - -#: ../dgit:5379 -msgid "dgit view: changes are required..." -msgstr "" - -#: ../dgit:5408 -#, perl-format -msgid "" -"\n" -"For full diff showing the problem(s), type:\n" -" %s\n" -msgstr "" - -#: ../dgit:5415 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-unapplied git tree\n" -" but git tree differs from orig in upstream files." -msgstr "" - -#: ../dgit:5421 -msgid "" -"\n" -" ... debian/patches is missing; perhaps this is a patch queue branch?" -msgstr "" - -#: ../dgit:5428 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-applied git tree\n" -" but git tree differs from result of applying debian/patches to upstream\n" -msgstr "" - -#: ../dgit:5435 -msgid "dgit view: creating patches-applied version using gbp pq" -msgstr "" - -#: ../dgit:5444 -#, perl-format -msgid "" -"--quilt=%s specified, implying that HEAD is for use with a\n" -" tool which does not create patches for changes to upstream\n" -" .gitignores: but, such patches exist in debian/patches.\n" -msgstr "" - -#: ../dgit:5453 -msgid "dgit view: creating patch to represent .gitignore changes" -msgstr "" - -#: ../dgit:5458 -#, perl-format -msgid "%s already exists; but want to create it to record .gitignore changes" -msgstr "" - -#: ../dgit:5463 -msgid "" -"Subject: Update .gitignore from Debian packaging branch\n" -"\n" -"The Debian packaging git branch contains these updates to the upstream\n" -".gitignore file(s). This patch is autogenerated, to provide these\n" -"updates to users of the official Debian archive view of the package.\n" -msgstr "" - -#: ../dgit:5485 -msgid "Commit patch to update .gitignore\n" -msgstr "" - -#: ../dgit:5499 -msgid "converted" -msgstr "" - -#: ../dgit:5500 -#, perl-format -msgid "dgit view: created (%s)" -msgstr "" - -#: ../dgit:5565 +#: ../dgit:5607 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5583 +#: ../dgit:5625 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5592 +#: ../dgit:5634 msgid "root commit" msgstr "" -#: ../dgit:5598 +#: ../dgit:5640 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5610 +#: ../dgit:5652 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5629 +#: ../dgit:5671 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5636 +#: ../dgit:5678 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5648 +#: ../dgit:5690 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5651 +#: ../dgit:5693 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5663 +#: ../dgit:5705 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1084,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5670 +#: ../dgit:5712 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5704 +#: ../dgit:5746 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5705 +#: ../dgit:5747 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5706 +#: ../dgit:5748 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5707 +#: ../dgit:5749 msgid "is series file\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5750 msgid "too long\n" msgstr "" -#: ../dgit:5712 +#: ../dgit:5754 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5741 +#: ../dgit:5783 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" +#: ../dgit:5866 +#, perl-format +msgid "" +"quilt mode %s does not make sense (or is not supported) with single-debian-" +"patch" +msgstr "" + #: ../dgit:5884 +msgid "converted" +msgstr "" + +#: ../dgit:5885 +#, perl-format +msgid "dgit view: created (%s)" +msgstr "" + +#: ../dgit:5939 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5894 +#: ../dgit:5949 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5996 +#: ../dgit:6059 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6027 +#: ../dgit:6091 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6032 +#: ../dgit:6096 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6043 +#: ../dgit:6131 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6134 +#: ../dgit:6245 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1532,58 +1169,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6148 +#: ../dgit:6259 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6185 +#: ../dgit:6293 +msgid "baredebian quilt fixup: could not find any origs" +msgstr "" + +#: ../dgit:6306 +msgid "tarball" +msgstr "" + +#: ../dgit:6324 +#, perl-format +msgid "Combine orig tarballs for %s %s" +msgstr "" + +#: ../dgit:6340 +msgid "tarballs" +msgstr "" + +#: ../dgit:6354 +msgid "upstream" +msgstr "" + +#: ../dgit:6378 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6188 +#: ../dgit:6388 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" -"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" +"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6194 +#: ../dgit:6397 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6198 +#: ../dgit:6401 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6205 +#: ../dgit:6408 +msgid "" +"This has only a debian/ directory; you probably want --quilt=bare debian." +msgstr "" + +#: ../dgit:6412 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6208 +#: ../dgit:6415 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6211 +#: ../dgit:6418 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6214 +#: ../dgit:6421 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6218 +#: ../dgit:6425 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6227 +#: ../dgit:6436 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6265 +#: ../dgit:6475 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1255,124 @@ msgid "" "\n" msgstr "" -#: ../dgit:6277 +#: ../dgit:6487 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6306 +#: ../dgit:6516 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:6318 +#: ../dgit:6528 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6321 +#: ../dgit:6531 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6324 +#: ../dgit:6534 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6342 +#: ../dgit:6547 +#, perl-format +msgid "" +"quilt mode %s (generally needs untracked upstream files)\n" +"contradicts clean mode %s (which would delete them)\n" +msgstr "" + +#: ../dgit:6564 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6356 +#: ../dgit:6578 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6369 +#: ../dgit:6597 #, perl-format -msgid "-p is not allowed with dgit %s" +msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6408 +#: ../dgit:6607 +msgid "" +"dgit: --include-dirty is not supported with split view (including with view-" +"splitting quilt modes)" +msgstr "" + +#: ../dgit:6616 +#, perl-format +msgid "dgit: --quilt=%s, %s" +msgstr "" + +#: ../dgit:6620 +msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" +msgstr "" + +#: ../dgit:6655 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6410 +#: ../dgit:6657 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6436 +#: ../dgit:6683 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6442 +#: ../dgit:6689 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6445 +#: ../dgit:6692 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6488 +#: ../dgit:6735 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6526 +#: ../dgit:6773 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6533 +#: ../dgit:6780 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6540 +#: ../dgit:6787 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6544 +#: ../dgit:6791 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6549 +#: ../dgit:6796 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6552 +#: ../dgit:6799 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6565 +#: ../dgit:6812 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1380,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6583 +#: ../dgit:6830 msgid "build successful\n" msgstr "" -#: ../dgit:6590 +#: ../dgit:6837 #, 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:6700 +#: ../dgit:6947 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6735 +#: ../dgit:6984 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6755 +#: ../dgit:7004 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6768 +#: ../dgit:7017 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6772 +#: ../dgit:7021 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6779 +#: ../dgit:7028 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6785 +#: ../dgit:7034 msgid "source changes file" msgstr "" -#: ../dgit:6787 +#: ../dgit:7036 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6807 ../dgit:6809 +#: ../dgit:7056 ../dgit:7058 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6822 +#: ../dgit:7071 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:6834 +#: ../dgit:7083 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6838 +#: ../dgit:7087 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:6868 +#: ../dgit:7117 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6890 +#: ../dgit:7138 msgid "source tree" msgstr "" -#: ../dgit:6892 +#: ../dgit:7140 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6905 +#: ../dgit:7153 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6909 +#: ../dgit:7157 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6913 +#: ../dgit:7161 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6930 +#: ../dgit:7178 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6935 +#: ../dgit:7183 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6937 +#: ../dgit:7185 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6948 +#: ../dgit:7196 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6951 +#: ../dgit:7199 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6962 +#: ../dgit:7210 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6973 +#: ../dgit:7221 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6982 +#: ../dgit:7230 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1517,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6989 +#: ../dgit:7237 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6991 +#: ../dgit:7239 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6996 +#: ../dgit:7244 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7001 +#: ../dgit:7249 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,134 +1539,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7021 +#: ../dgit:7269 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7023 +#: ../dgit:7271 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7279 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7050 +#: ../dgit:7298 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7054 +#: ../dgit:7302 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7055 +#: ../dgit:7303 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7066 +#: ../dgit:7314 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7068 +#: ../dgit:7316 msgid "Import, merging." msgstr "" -#: ../dgit:7082 +#: ../dgit:7330 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7091 +#: ../dgit:7339 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7098 +#: ../dgit:7346 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7104 +#: ../dgit:7352 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7118 +#: ../dgit:7366 msgid "need destination argument" msgstr "" -#: ../dgit:7123 +#: ../dgit:7371 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7131 +#: ../dgit:7379 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7142 +#: ../dgit:7390 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7148 +#: ../dgit:7396 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7155 ../dgit:7161 +#: ../dgit:7403 ../dgit:7409 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7167 +#: ../dgit:7415 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7214 +#: ../dgit:7462 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7253 +#: ../dgit:7501 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7257 +#: ../dgit:7505 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7348 +#: ../dgit:7605 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7368 +#: ../dgit:7620 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7423 +#: ../dgit:7675 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7438 +#: ../dgit:7690 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7442 +#: ../dgit:7694 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7448 +#: ../dgit:7700 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1989,49 +1674,40 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7465 +#: ../dgit:7717 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7478 +#: ../dgit:7730 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7498 +#: ../dgit:7750 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7508 +#: ../dgit:7761 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7513 -msgid "dgit: --include-dirty is not supported in split view quilt mode" -msgstr "" - -#: ../dgit:7524 -#, perl-format -msgid "unknown clean-mode `%s'" -msgstr "" - -#: ../dgit:7545 +#: ../dgit:7789 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7546 +#: ../dgit:7790 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7565 +#: ../dgit:7809 #, perl-format msgid "unknown operation %s" msgstr "" -#: ../git-debrebase:44 +#: ../git-debrebase:45 msgid "" "usages:\n" " git-debrebase [] [--|-i ]\n" @@ -2044,60 +1720,60 @@ msgid "" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" -#: ../git-debrebase:67 +#: ../git-debrebase:68 #, perl-format msgid "%s: bad usage: %s\n" msgstr "" -#: ../git-debrebase:78 +#: ../git-debrebase:79 #, perl-format msgid "bad options follow `git-debrebase %s'" msgstr "" -#: ../git-debrebase:89 +#: ../git-debrebase:90 #, perl-format msgid "missing required git config %s" msgstr "" -#: ../git-debrebase:401 +#: ../git-debrebase:364 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "" -#: ../git-debrebase:404 +#: ../git-debrebase:367 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "" -#: ../git-debrebase:417 +#: ../git-debrebase:380 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" -#: ../git-debrebase:423 +#: ../git-debrebase:386 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "" -#: ../git-debrebase:427 +#: ../git-debrebase:390 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f, or --force)" msgstr "" -#: ../git-debrebase:459 +#: ../git-debrebase:422 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" msgstr "" -#: ../git-debrebase:466 +#: ../git-debrebase:429 #, perl-format msgid "" "%s\n" "Is this meant to be a gdr branch? %s\n" msgstr "" -#: ../git-debrebase:471 +#: ../git-debrebase:434 #, perl-format msgid "" "%s\n" @@ -2105,7 +1781,7 @@ msgid "" "Consider git-debrebase scrap, to throw away your recent work.\n" msgstr "" -#: ../git-debrebase:477 +#: ../git-debrebase:440 #, perl-format msgid "" "%s\n" @@ -2113,7 +1789,7 @@ msgid "" "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" msgstr "" -#: ../git-debrebase:488 +#: ../git-debrebase:451 #, perl-format msgid "" "%s\n" @@ -2121,418 +1797,415 @@ msgid "" "Maybe you reset to, or rebased from, somewhere inappropriate.\n" msgstr "" -#: ../git-debrebase:935 +#: ../git-debrebase:898 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "" -#: ../git-debrebase:937 +#: ../git-debrebase:900 msgid "has other than two parents" msgstr "" -#: ../git-debrebase:938 +#: ../git-debrebase:901 msgid "contains debian/patches" msgstr "" -#: ../git-debrebase:964 +#: ../git-debrebase:927 msgid "is an origin commit" msgstr "" -#: ../git-debrebase:966 +#: ../git-debrebase:929 msgid "upstream files differ from left parent" msgstr "" -#: ../git-debrebase:968 +#: ../git-debrebase:931 msgid "debian/ differs from right parent" msgstr "" -#: ../git-debrebase:979 +#: ../git-debrebase:942 msgid "edits debian/patches" msgstr "" -#: ../git-debrebase:991 +#: ../git-debrebase:954 msgid "parent's debian is not a directory" msgstr "" -#: ../git-debrebase:998 +#: ../git-debrebase:961 msgid "no changes" msgstr "" -#: ../git-debrebase:1004 +#: ../git-debrebase:967 msgid "origin commit" msgstr "" -#: ../git-debrebase:1055 +#: ../git-debrebase:1018 #, perl-format msgid "unknown kind of merge from %s" msgstr "" -#: ../git-debrebase:1058 +#: ../git-debrebase:1021 msgid "octopus merge" msgstr "" -#: ../git-debrebase:1062 +#: ../git-debrebase:1025 msgid "general two-parent merge" msgstr "" -#: ../git-debrebase:1079 +#: ../git-debrebase:1042 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "" -#: ../git-debrebase:1119 +#: ../git-debrebase:1082 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "" -#: ../git-debrebase:1147 +#: ../git-debrebase:1110 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "" -#: ../git-debrebase:1148 +#: ../git-debrebase:1111 #, perl-format msgid " (eg %s)" msgstr "" -#: ../git-debrebase:1154 +#: ../git-debrebase:1117 msgid "found mixed upstream/packaging commit" msgstr "" -#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168 -#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187 +#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 +#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 #, perl-format msgid " (%s)" msgstr "" -#: ../git-debrebase:1162 +#: ../git-debrebase:1125 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "" -#: ../git-debrebase:1167 +#: ../git-debrebase:1130 msgid "found dgit dsc import" msgstr "" -#: ../git-debrebase:1172 +#: ../git-debrebase:1135 msgid "found bare dgit dsc import with no prior history" msgstr "" -#: ../git-debrebase:1178 +#: ../git-debrebase:1141 msgid "found vanilla merge" msgstr "" -#: ../git-debrebase:1185 +#: ../git-debrebase:1148 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1253 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1254 +#: ../git-debrebase:1217 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1375 +#: ../git-debrebase:1338 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1715 ../git-debrebase:1718 +#: ../git-debrebase:1678 ../git-debrebase:1681 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1721 +#: ../git-debrebase:1684 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1731 +#: ../git-debrebase:1694 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1759 +#: ../git-debrebase:1722 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1773 +#: ../git-debrebase:1736 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1799 +#: ../git-debrebase:1762 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1804 +#: ../git-debrebase:1767 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1806 +#: ../git-debrebase:1769 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1841 +#: ../git-debrebase:1802 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../git-debrebase:1804 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1864 +#: ../git-debrebase:1827 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1868 +#: ../git-debrebase:1831 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1872 +#: ../git-debrebase:1835 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1894 +#: ../git-debrebase:1857 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1897 +#: ../git-debrebase:1860 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1925 +#: ../git-debrebase:1888 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1933 +#: ../git-debrebase:1896 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1944 +#: ../git-debrebase:1907 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1964 +#: ../git-debrebase:1927 msgid "fast forward" msgstr "" -#: ../git-debrebase:1974 +#: ../git-debrebase:1937 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1986 +#: ../git-debrebase:1949 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2017 -#, perl-format -msgid "" -"Could not determine appropriate upstream commitish.\n" -" (Tried these tags: %s)\n" -" Check version, and specify upstream commitish explicitly." -msgstr "" - -#: ../git-debrebase:2036 +#: ../git-debrebase:1966 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2041 +#: ../git-debrebase:1971 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2059 +#: ../git-debrebase:1989 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2060 +#: ../git-debrebase:1990 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2080 +#: ../git-debrebase:2010 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2098 +#: ../git-debrebase:2028 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "old anchor is recognized due to --anchor, cannot check upstream" -#: ../git-debrebase:2114 +#: ../git-debrebase:2044 #, 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:2123 +#: ../git-debrebase:2053 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2136 +#: ../git-debrebase:2066 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2147 +#: ../git-debrebase:2077 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2150 +#: ../git-debrebase:2080 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2153 +#: ../git-debrebase:2083 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2194 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2268 +#: ../git-debrebase:2198 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 -#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 -#: ../git-debrebase:2472 +#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 +#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 +#: ../git-debrebase:2402 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2307 +#: ../git-debrebase:2237 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2308 +#: ../git-debrebase:2238 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2309 +#: ../git-debrebase:2239 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2310 +#: ../git-debrebase:2240 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2320 +#: ../git-debrebase:2250 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2322 +#: ../git-debrebase:2252 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2338 +#: ../git-debrebase:2268 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2344 +#: ../git-debrebase:2274 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2345 +#: ../git-debrebase:2275 msgid "anchor" msgstr "" -#: ../git-debrebase:2346 +#: ../git-debrebase:2276 msgid "breakwater" msgstr "" -#: ../git-debrebase:2351 +#: ../git-debrebase:2281 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2358 +#: ../git-debrebase:2288 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2291 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2363 +#: ../git-debrebase:2293 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2365 +#: ../git-debrebase:2295 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2368 +#: ../git-debrebase:2298 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2385 ../git-debrebase:2398 +#: ../git-debrebase:2315 ../git-debrebase:2328 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2392 ../git-debrebase:2422 +#: ../git-debrebase:2322 ../git-debrebase:2352 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2461 +#: ../git-debrebase:2391 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2478 +#: ../git-debrebase:2408 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2485 +#: ../git-debrebase:2415 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2505 +#: ../git-debrebase:2435 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2510 +#: ../git-debrebase:2440 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2517 +#: ../git-debrebase:2447 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2525 +#: ../git-debrebase:2455 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2530 +#: ../git-debrebase:2460 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2476 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2551 +#: ../git-debrebase:2481 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2567 +#: ../git-debrebase:2497 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2540,58 +2213,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2575 +#: ../git-debrebase:2505 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2582 +#: ../git-debrebase:2512 #, 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:2584 +#: ../git-debrebase:2514 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2591 +#: ../git-debrebase:2521 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2609 +#: ../git-debrebase:2539 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2615 +#: ../git-debrebase:2545 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2548 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2551 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2623 +#: ../git-debrebase:2553 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2625 +#: ../git-debrebase:2555 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2632 +#: ../git-debrebase:2562 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2599,12 +2272,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2678 +#: ../git-debrebase:2608 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2707 +#: ../git-debrebase:2637 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2612,16 +2285,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2728 +#: ../git-debrebase:2658 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2736 +#: ../git-debrebase:2666 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2680 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2629,225 +2302,242 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2754 +#: ../git-debrebase:2684 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2766 +#: ../git-debrebase:2696 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2773 +#: ../git-debrebase:2703 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2779 +#: ../git-debrebase:2709 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2788 +#: ../git-debrebase:2718 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2794 +#: ../git-debrebase:2724 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2825 +#: ../git-debrebase:2755 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2834 +#: ../git-debrebase:2764 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2871 +#: ../git-debrebase:2801 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2880 +#: ../git-debrebase:2810 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2894 +#: ../git-debrebase:2824 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:2900 +#: ../git-debrebase:2830 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2837 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2911 +#: ../git-debrebase:2841 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3013 +#: ../git-debrebase:2943 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3023 +#: ../git-debrebase:2953 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3053 +#: ../git-debrebase:2983 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:295 +#: ../Debian/Dgit.pm:293 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:315 +#: ../Debian/Dgit.pm:319 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:334 +#: ../Debian/Dgit.pm:338 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:336 +#: ../Debian/Dgit.pm:340 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:339 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:347 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:349 +#: ../Debian/Dgit.pm:353 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:355 +#: ../Debian/Dgit.pm:359 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:357 +#: ../Debian/Dgit.pm:361 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:363 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:450 +#: ../Debian/Dgit.pm:454 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:460 +#: ../Debian/Dgit.pm:464 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:479 +#: ../Debian/Dgit.pm:483 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:485 +#: ../Debian/Dgit.pm:489 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:506 +#: ../Debian/Dgit.pm:510 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:513 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:617 +#: ../Debian/Dgit.pm:621 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:618 +#: ../Debian/Dgit.pm:622 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:689 +#: ../Debian/Dgit.pm:644 +msgid "using specified upstream commitish" +msgstr "" + +#: ../Debian/Dgit.pm:650 +#, perl-format +msgid "" +"Could not determine appropriate upstream commitish.\n" +" (Tried these tags: %s)\n" +" Check version, and specify upstream commitish explicitly." +msgstr "" + +#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#, perl-format +msgid "using upstream from git tag %s" +msgstr "" + +#: ../Debian/Dgit.pm:764 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:690 +#: ../Debian/Dgit.pm:765 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:706 +#: ../Debian/Dgit.pm:781 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:715 +#: ../Debian/Dgit.pm:790 #, 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:729 +#: ../Debian/Dgit.pm:804 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:750 +#: ../Debian/Dgit.pm:825 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:911 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:843 +#: ../Debian/Dgit.pm:932 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:1000 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:934 +#: ../Debian/Dgit.pm:1023 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:942 +#: ../Debian/Dgit.pm:1031 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:951 +#: ../Debian/Dgit.pm:1040 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 69096f01..f46f89ef 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,32 +6,9 @@ #, fuzzy msgid "" msgstr "" -"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 21:54+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n" -"Project-Id-Version: dgit ongoing\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 21:54+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n" -"Project-Id-Version: dgit ongoing\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 15:31+0000\n" +"POT-Creation-Date: 2019-07-21 00:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,78 +17,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:242 +#: ../dgit:264 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:249 +#: ../dgit:271 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:257 +#: ../dgit:279 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:262 +#: ../dgit:284 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:487 +#: ../dgit:516 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:492 ../dgit:498 +#: ../dgit:521 ../dgit:527 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:493 +#: ../dgit:522 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:501 +#: ../dgit:530 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:508 +#: ../dgit:537 msgid "protocol message" msgstr "" -#: ../dgit:516 +#: ../dgit:545 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:537 +#: ../dgit:566 msgid "bad byte count" msgstr "" -#: ../dgit:540 +#: ../dgit:569 msgid "data block" msgstr "" -#: ../dgit:621 +#: ../dgit:650 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:633 +#: ../dgit:662 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:635 +#: ../dgit:664 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:660 +#: ../dgit:689 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -132,141 +109,153 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:679 +#: ../dgit:708 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:683 +#: ../dgit:712 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:688 +#: ../dgit:717 msgid "too few arguments" msgstr "" -#: ../dgit:799 +#: ../dgit:833 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:802 +#: ../dgit:836 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:822 +#: ../dgit:856 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:863 +#: ../dgit:897 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:878 +#: ../dgit:912 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:894 +#: ../dgit:928 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:914 +#: ../dgit:948 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:966 +#, perl-format +msgid "unknown %s `%s'" +msgstr "" + +#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 msgid "internal error" msgstr "" -#: ../dgit:925 +#: ../dgit:973 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:929 +#: ../dgit:977 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1094 +#: ../dgit:1000 +#, perl-format +msgid "" +"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " +"set to `%s'" +msgstr "" + +#: ../dgit:1163 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1140 +#: ../dgit:1209 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1161 +#: ../dgit:1230 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1169 +#: ../dgit:1238 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1173 +#: ../dgit:1242 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1189 +#: ../dgit:1258 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1193 +#: ../dgit:1262 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1195 +#: ../dgit:1264 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1197 +#: ../dgit:1266 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1199 ../dgit:1224 +#: ../dgit:1268 ../dgit:1293 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1213 +#: ../dgit:1282 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1215 +#: ../dgit:1284 msgid "bad component" msgstr "" -#: ../dgit:1218 +#: ../dgit:1287 msgid "bad filename" msgstr "" -#: ../dgit:1220 +#: ../dgit:1289 msgid "bad sha256sum" msgstr "" -#: ../dgit:1271 +#: ../dgit:1340 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1355 +#: ../dgit:1424 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -274,163 +263,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1377 +#: ../dgit:1448 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1405 +#: ../dgit:1474 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1406 +#: ../dgit:1475 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1511 +#: ../dgit:1580 #, 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:1702 +#: ../dgit:1719 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1705 +#: ../dgit:1722 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1707 +#: ../dgit:1724 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1727 +#: ../dgit:1744 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1733 +#: ../dgit:1750 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1760 +#: ../dgit:1777 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1777 +#: ../dgit:1794 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1792 +#: ../dgit:1809 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1807 +#: ../dgit:1824 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1844 +#: ../dgit:1861 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1890 +#: ../dgit:1907 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1901 +#: ../dgit:1918 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1947 +#: ../dgit:1964 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1956 +#: ../dgit:1973 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1960 +#: ../dgit:1977 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1966 +#: ../dgit:1983 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2006 +#: ../dgit:2023 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2019 +#: ../dgit:2036 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2032 +#: ../dgit:2049 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2048 +#: ../dgit:2065 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2053 +#: ../dgit:2070 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2061 +#: ../dgit:2078 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2068 +#: ../dgit:2085 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2096 +#: ../dgit:2113 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2104 +#: ../dgit:2121 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2107 +#: ../dgit:2124 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2131 +#: ../dgit:2143 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2154 +#: ../dgit:2166 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -445,113 +434,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2166 +#: ../dgit:2178 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2197 +#: ../dgit:2209 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2199 +#: ../dgit:2211 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2201 +#: ../dgit:2213 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2206 +#: ../dgit:2218 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2243 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2235 +#: ../dgit:2247 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2237 +#: ../dgit:2249 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2240 +#: ../dgit:2252 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2249 +#: ../dgit:2261 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2253 +#: ../dgit:2265 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2256 +#: ../dgit:2268 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2262 +#: ../dgit:2274 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2294 ../dgit:2299 -#, perl-format -msgid "accessing %s: %s" -msgstr "" - -#: ../dgit:2314 ../dgit:2321 -#, perl-format -msgid "saving %s: %s" -msgstr "" - -#: ../dgit:2386 +#: ../dgit:2345 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2450 ../dgit:5974 -msgid "source package" -msgstr "" - -#: ../dgit:2468 +#: ../dgit:2407 msgid "package changelog" msgstr "" -#: ../dgit:2508 +#: ../dgit:2447 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2527 +#: ../dgit:2516 ../dgit:2521 #, perl-format -msgid "Import %s" +msgid "accessing %s: %s" msgstr "" -#: ../dgit:2608 +#: ../dgit:2536 ../dgit:2543 +#, perl-format +msgid "saving %s: %s" +msgstr "" + +#: ../dgit:2569 ../dgit:6035 +msgid "source package" +msgstr "" + +#: ../dgit:2647 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2627 +#: ../dgit:2666 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2636 +#: ../dgit:2675 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -560,21 +544,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2651 +#: ../dgit:2690 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2655 +#: ../dgit:2694 msgid "Import of source package" msgstr "" -#: ../dgit:2668 -#, perl-format -msgid "Record %s (%s) in archive suite %s\n" -msgstr "" - -#: ../dgit:2672 +#: ../dgit:2714 #, perl-format msgid "" "\n" @@ -583,51 +562,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2714 +#: ../dgit:2756 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2718 +#: ../dgit:2760 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2722 +#: ../dgit:2764 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2738 +#: ../dgit:2780 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2833 +#: ../dgit:2875 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2848 +#: ../dgit:2890 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2892 +#: ../dgit:2934 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2907 +#: ../dgit:2949 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:2912 +#: ../dgit:2954 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -637,49 +616,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2979 -#, perl-format -msgid "Not updating %s from %s to %s.\n" -msgstr "" - -#: ../dgit:3028 -#, perl-format -msgid "%s: NO git hash" -msgstr "" - -#: ../dgit:3032 -#, perl-format -msgid "%s: specified git info (%s)" -msgstr "" - -#: ../dgit:3039 -#, perl-format -msgid "%s: specified git hash" -msgstr "" - -#: ../dgit:3041 -#, perl-format -msgid "%s: invalid Dgit info" -msgstr "" - -#: ../dgit:3063 +#: ../dgit:3101 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3068 +#: ../dgit:3106 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3073 +#: ../dgit:3111 #, 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:3083 +#: ../dgit:3121 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -688,54 +642,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3103 +#: ../dgit:3141 msgid "rewrite map" msgstr "" -#: ../dgit:3110 +#: ../dgit:3148 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3114 +#: ../dgit:3152 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3116 +#: ../dgit:3154 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3123 +#: ../dgit:3161 msgid "additional commits" msgstr "" -#: ../dgit:3126 +#: ../dgit:3164 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3151 +#: ../dgit:3189 msgid "last upload to archive" msgstr "" -#: ../dgit:3155 +#: ../dgit:3193 msgid "no version available from the archive" msgstr "" -#: ../dgit:3238 +#: ../dgit:3276 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3245 +#: ../dgit:3283 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3250 +#: ../dgit:3288 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3278 +#: ../dgit:3316 #, perl-format msgid "" "\n" @@ -745,15 +699,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3291 +#: ../dgit:3329 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3294 +#: ../dgit:3332 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3315 +#: ../dgit:3353 #, perl-format msgid "" "\n" @@ -761,7 +715,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3324 +#: ../dgit:3362 #, perl-format msgid "" "\n" @@ -771,7 +725,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3409 +#: ../dgit:3447 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -779,19 +733,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3422 +#: ../dgit:3460 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3440 +#: ../dgit:3478 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3442 +#: ../dgit:3480 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3453 +#: ../dgit:3491 #, perl-format msgid "" "\n" @@ -801,30 +755,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3468 +#: ../dgit:3506 msgid "fetched source tree" msgstr "" -#: ../dgit:3504 +#: ../dgit:3542 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3569 +#: ../dgit:3607 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3583 +#: ../dgit:3621 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3598 +#: ../dgit:3636 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3625 +#: ../dgit:3663 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -832,30 +786,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3647 +#: ../dgit:3685 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3655 +#: ../dgit:3693 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3694 +#: ../dgit:3732 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3726 +#: ../dgit:3764 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3728 +#: ../dgit:3766 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3767 +#: ../dgit:3805 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -863,7 +817,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3781 +#: ../dgit:3819 msgid "" "\n" "Key\n" @@ -872,613 +826,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3796 +#: ../dgit:3834 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3814 +#: ../dgit:3852 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3822 +#: ../dgit:3860 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3837 +#: ../dgit:3875 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3853 +#: ../dgit:3891 msgid "fetching existing git history" msgstr "" -#: ../dgit:3857 +#: ../dgit:3895 msgid "starting new git history" msgstr "" -#: ../dgit:3883 +#: ../dgit:3921 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3888 +#: ../dgit:3926 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3900 +#: ../dgit:3938 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3902 +#: ../dgit:3940 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3910 +#: ../dgit:3948 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3921 +#: ../dgit:3959 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3940 +#: ../dgit:3978 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3957 +#: ../dgit:3995 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3960 +#: ../dgit:3998 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3964 +#: ../dgit:4002 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4007 +#: ../dgit:4045 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4012 +#: ../dgit:4050 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4022 +#: ../dgit:4060 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4028 +#: ../dgit:4066 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4054 +#: ../dgit:4092 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4057 +#: ../dgit:4095 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4065 +#: ../dgit:4103 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4074 +#: ../dgit:4112 msgid "version currently in archive" msgstr "" -#: ../dgit:4083 +#: ../dgit:4121 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4091 +#: ../dgit:4129 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4101 +#: ../dgit:4140 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4104 +#: ../dgit:4143 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4118 +#: ../dgit:4157 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4174 +#: ../dgit:4213 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4183 +#: ../dgit:4222 msgid "maintainer view tag" msgstr "" -#: ../dgit:4185 +#: ../dgit:4224 msgid "dgit view tag" msgstr "" -#: ../dgit:4186 +#: ../dgit:4225 msgid "current archive contents" msgstr "" -#: ../dgit:4199 +#: ../dgit:4238 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4209 +#: ../dgit:4248 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4249 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4214 +#: ../dgit:4253 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4227 +#: ../dgit:4266 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4235 +#: ../dgit:4274 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4247 +#: ../dgit:4286 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4269 +#: ../dgit:4308 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4330 +#: ../dgit:4362 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4358 -#, perl-format -msgid "%s release %s for %s (%s) [dgit]\n" -msgstr "" - -#: ../dgit:4371 -#, perl-format -msgid "" -"%s release %s for %s (%s)\n" -"(maintainer view tag generated by dgit --quilt=%s)\n" -msgstr "" - -#: ../dgit:4423 -msgid "" -"Push failed, while checking state of the archive.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4432 -msgid "" -"package appears to be new in this suite; if this is intentional, use --new" -msgstr "" - -#: ../dgit:4437 -msgid "" -"Push failed, while preparing your push.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4460 -#, perl-format -msgid "looked for .dsc %s, but %s; maybe you forgot to build" -msgstr "" - -#: ../dgit:4477 -#, perl-format -msgid "" -"Branch is managed by git-debrebase (%s\n" -"exists), but quilt mode (%s) implies a split view.\n" -"Pass the right --quilt option or adjust your git config.\n" -"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" -msgstr "" - -#: ../dgit:4501 -#, perl-format -msgid "" -"--quilt=%s but no cached dgit view:\n" -" perhaps HEAD changed since dgit build[-source] ?" -msgstr "" - -#: ../dgit:4532 -msgid "" -"dgit push: HEAD is not a descendant of the archive's version.\n" -"To overwrite the archive's contents, pass --overwrite[=VERSION].\n" -"To rewind history, if permitted by the archive, use --deliberately-not-fast-" -"forward." -msgstr "" - -#: ../dgit:4542 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "" - -#: ../dgit:4576 ../dgit:4588 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "" - -#: ../dgit:4582 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" - -#: ../dgit:4592 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" - -#: ../dgit:4603 -#, perl-format -msgid "" -"failed to find unique changes file (looked for %s in %s); perhaps you need " -"to use dgit -C" -msgstr "" - -#: ../dgit:4625 -msgid "uploading binaries, although distro policy is source only" -msgstr "" - -#: ../dgit:4629 -msgid "source-only upload, although distro policy requires .debs" -msgstr "" - -#: ../dgit:4633 -#, perl-format -msgid "" -"source-only upload, even though package is entirely NEW\n" -"(this is contrary to policy in %s)" -msgstr "" - -#: ../dgit:4640 -#, perl-format -msgid "unknown source-only-uploads policy `%s'" -msgstr "" - -#: ../dgit:4684 -msgid "" -"Push failed, while signing the tag.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" - -#: ../dgit:4697 -msgid "" -"Push failed, *after* signing the tag.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" - -#: ../dgit:4714 -msgid "" -"Push failed, while updating the remote git repository - see messages above.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" - -#: ../dgit:4731 -msgid "" -"Push failed, while obtaining signatures on the .changes and .dsc.\n" -"If it was just that the signature failed, you may try again by using\n" -"debsign by hand to sign the changes file (see the command dgit tried,\n" -"above), and then dput that changes file to complete the upload.\n" -"If you need to change the package, you must use a new version number.\n" -msgstr "" - -#: ../dgit:4762 -#, perl-format -msgid "pushed and uploaded %s" -msgstr "" - -#: ../dgit:4774 -msgid "-p is not allowed with clone; specify as argument instead" -msgstr "" - -#: ../dgit:4785 -msgid "incorrect arguments to dgit clone" -msgstr "" - -#: ../dgit:4791 ../git-debrebase:1839 -#, perl-format -msgid "%s already exists" -msgstr "" - -#: ../dgit:4805 -#, perl-format -msgid "remove %s: %s\n" -msgstr "" - -#: ../dgit:4809 -#, perl-format -msgid "check whether to remove %s: %s\n" -msgstr "" - -#: ../dgit:4847 -msgid "incorrect arguments to dgit fetch or dgit pull" -msgstr "" - -#: ../dgit:4864 -#, perl-format -msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" -msgstr "" - -#: ../dgit:4873 -msgid "dgit checkout needs a suite argument" -msgstr "" - -#: ../dgit:4935 -#, perl-format -msgid "setting up vcs-git: %s\n" -msgstr "" - -#: ../dgit:4938 -#, perl-format -msgid "vcs git already configured: %s\n" -msgstr "" - -#: ../dgit:4940 -#, perl-format -msgid "changing vcs-git url to: %s\n" -msgstr "" - -#: ../dgit:4945 -#, perl-format -msgid "fetching (%s)\n" -msgstr "" - -#: ../dgit:4960 -#, perl-format -msgid "incorrect arguments to dgit %s" -msgstr "" - -#: ../dgit:4971 -#, perl-format -msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" -msgstr "" - -#: ../dgit:5009 -#, perl-format -msgid "" -"build host has dgit rpush protocol versions %s but invocation host has %s" -msgstr "" - -#: ../dgit:5089 -#, perl-format -msgid "create %s: %s" -msgstr "" - -#: ../dgit:5126 -#, perl-format -msgid "build host child failed: %s" -msgstr "" - -#: ../dgit:5129 -msgid "all done\n" -msgstr "" - -#: ../dgit:5138 -#, perl-format -msgid "file %s (%s) twice" -msgstr "" - -#: ../dgit:5146 -msgid "bad param spec" -msgstr "" - -#: ../dgit:5152 -msgid "bad previously spec" -msgstr "" - -#: ../dgit:5171 -#, perl-format -msgid "" -"rpush negotiated protocol version %s which does not support quilt mode %s" -msgstr "" - -#: ../dgit:5216 -#, perl-format -msgid "buildinfo mismatch in field %s" -msgstr "" - -#: ../dgit:5219 -#, perl-format -msgid "buildinfo contains forbidden field %s" -msgstr "" - -#: ../dgit:5260 -msgid "remote changes file" -msgstr "" - -#: ../dgit:5335 -msgid "not a plain file or symlink\n" -msgstr "" - -#: ../dgit:5341 -msgid "mode or type changed\n" -msgstr "" - -#: ../dgit:5342 -msgid "modified symlink\n" -msgstr "" - -#: ../dgit:5345 -msgid "deletion of symlink\n" -msgstr "" - -#: ../dgit:5349 -msgid "creation with non-default mode\n" -msgstr "" - -#: ../dgit:5379 -msgid "dgit view: changes are required..." -msgstr "" - -#: ../dgit:5408 -#, perl-format -msgid "" -"\n" -"For full diff showing the problem(s), type:\n" -" %s\n" -msgstr "" - -#: ../dgit:5415 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-unapplied git tree\n" -" but git tree differs from orig in upstream files." -msgstr "" - -#: ../dgit:5421 -msgid "" -"\n" -" ... debian/patches is missing; perhaps this is a patch queue branch?" -msgstr "" - -#: ../dgit:5428 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-applied git tree\n" -" but git tree differs from result of applying debian/patches to upstream\n" -msgstr "" - -#: ../dgit:5435 -msgid "dgit view: creating patches-applied version using gbp pq" -msgstr "" - -#: ../dgit:5444 -#, perl-format -msgid "" -"--quilt=%s specified, implying that HEAD is for use with a\n" -" tool which does not create patches for changes to upstream\n" -" .gitignores: but, such patches exist in debian/patches.\n" -msgstr "" - -#: ../dgit:5453 -msgid "dgit view: creating patch to represent .gitignore changes" -msgstr "" - -#: ../dgit:5458 -#, perl-format -msgid "%s already exists; but want to create it to record .gitignore changes" -msgstr "" - -#: ../dgit:5463 -msgid "" -"Subject: Update .gitignore from Debian packaging branch\n" -"\n" -"The Debian packaging git branch contains these updates to the upstream\n" -".gitignore file(s). This patch is autogenerated, to provide these\n" -"updates to users of the official Debian archive view of the package.\n" -msgstr "" - -#: ../dgit:5485 -msgid "Commit patch to update .gitignore\n" -msgstr "" - -#: ../dgit:5499 -msgid "converted" -msgstr "" - -#: ../dgit:5500 -#, perl-format -msgid "dgit view: created (%s)" -msgstr "" - -#: ../dgit:5565 +#: ../dgit:5607 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5583 +#: ../dgit:5625 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5592 +#: ../dgit:5634 msgid "root commit" msgstr "" -#: ../dgit:5598 +#: ../dgit:5640 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5610 +#: ../dgit:5652 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5629 +#: ../dgit:5671 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5636 +#: ../dgit:5678 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5648 +#: ../dgit:5690 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5651 +#: ../dgit:5693 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5663 +#: ../dgit:5705 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1486,68 +1084,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5670 +#: ../dgit:5712 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5704 +#: ../dgit:5746 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5705 +#: ../dgit:5747 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5706 +#: ../dgit:5748 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5707 +#: ../dgit:5749 msgid "is series file\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5750 msgid "too long\n" msgstr "" -#: ../dgit:5712 +#: ../dgit:5754 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5741 +#: ../dgit:5783 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" +#: ../dgit:5866 +#, perl-format +msgid "" +"quilt mode %s does not make sense (or is not supported) with single-debian-" +"patch" +msgstr "" + #: ../dgit:5884 +msgid "converted" +msgstr "" + +#: ../dgit:5885 +#, perl-format +msgid "dgit view: created (%s)" +msgstr "" + +#: ../dgit:5939 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5894 +#: ../dgit:5949 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5996 +#: ../dgit:6059 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6027 +#: ../dgit:6091 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6032 +#: ../dgit:6096 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6043 +#: ../dgit:6131 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6134 +#: ../dgit:6245 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1555,58 +1169,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6148 +#: ../dgit:6259 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6185 +#: ../dgit:6293 +msgid "baredebian quilt fixup: could not find any origs" +msgstr "" + +#: ../dgit:6306 +msgid "tarball" +msgstr "" + +#: ../dgit:6324 +#, perl-format +msgid "Combine orig tarballs for %s %s" +msgstr "" + +#: ../dgit:6340 +msgid "tarballs" +msgstr "" + +#: ../dgit:6354 +msgid "upstream" +msgstr "" + +#: ../dgit:6378 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6188 +#: ../dgit:6388 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" -"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" +"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6194 +#: ../dgit:6397 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6198 +#: ../dgit:6401 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6205 +#: ../dgit:6408 +msgid "" +"This has only a debian/ directory; you probably want --quilt=bare debian." +msgstr "" + +#: ../dgit:6412 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6208 +#: ../dgit:6415 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6211 +#: ../dgit:6418 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6214 +#: ../dgit:6421 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6218 +#: ../dgit:6425 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6227 +#: ../dgit:6436 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6265 +#: ../dgit:6475 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1615,102 +1255,124 @@ msgid "" "\n" msgstr "" -#: ../dgit:6277 +#: ../dgit:6487 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6306 +#: ../dgit:6516 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:6318 +#: ../dgit:6528 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6321 +#: ../dgit:6531 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6324 +#: ../dgit:6534 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6342 +#: ../dgit:6547 +#, perl-format +msgid "" +"quilt mode %s (generally needs untracked upstream files)\n" +"contradicts clean mode %s (which would delete them)\n" +msgstr "" + +#: ../dgit:6564 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6356 +#: ../dgit:6578 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6369 +#: ../dgit:6597 #, perl-format -msgid "-p is not allowed with dgit %s" +msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6408 +#: ../dgit:6607 +msgid "" +"dgit: --include-dirty is not supported with split view (including with view-" +"splitting quilt modes)" +msgstr "" + +#: ../dgit:6616 +#, perl-format +msgid "dgit: --quilt=%s, %s" +msgstr "" + +#: ../dgit:6620 +msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" +msgstr "" + +#: ../dgit:6655 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6410 +#: ../dgit:6657 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6436 +#: ../dgit:6683 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6442 +#: ../dgit:6689 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6445 +#: ../dgit:6692 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6488 +#: ../dgit:6735 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6526 +#: ../dgit:6773 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6533 +#: ../dgit:6780 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6540 +#: ../dgit:6787 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6544 +#: ../dgit:6791 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6549 +#: ../dgit:6796 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6552 +#: ../dgit:6799 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6565 +#: ../dgit:6812 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1718,136 +1380,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6583 +#: ../dgit:6830 msgid "build successful\n" msgstr "" -#: ../dgit:6590 +#: ../dgit:6837 #, 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:6700 +#: ../dgit:6947 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6735 +#: ../dgit:6984 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6755 +#: ../dgit:7004 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6768 +#: ../dgit:7017 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6772 +#: ../dgit:7021 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6779 +#: ../dgit:7028 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6785 +#: ../dgit:7034 msgid "source changes file" msgstr "" -#: ../dgit:6787 +#: ../dgit:7036 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6807 ../dgit:6809 +#: ../dgit:7056 ../dgit:7058 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6822 +#: ../dgit:7071 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:6834 +#: ../dgit:7083 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6838 +#: ../dgit:7087 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:6868 +#: ../dgit:7117 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6890 +#: ../dgit:7138 msgid "source tree" msgstr "" -#: ../dgit:6892 +#: ../dgit:7140 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6905 +#: ../dgit:7153 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6909 +#: ../dgit:7157 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6913 +#: ../dgit:7161 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6930 +#: ../dgit:7178 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6935 +#: ../dgit:7183 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6937 +#: ../dgit:7185 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6948 +#: ../dgit:7196 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6951 +#: ../dgit:7199 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6962 +#: ../dgit:7210 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6973 +#: ../dgit:7221 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6982 +#: ../dgit:7230 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1855,21 +1517,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6989 +#: ../dgit:7237 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6991 +#: ../dgit:7239 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6996 +#: ../dgit:7244 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7001 +#: ../dgit:7249 #, perl-format msgid "" "Branch %s already exists\n" @@ -1877,134 +1539,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7021 +#: ../dgit:7269 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7023 +#: ../dgit:7271 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7279 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7050 +#: ../dgit:7298 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7054 +#: ../dgit:7302 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7055 +#: ../dgit:7303 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7066 +#: ../dgit:7314 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7068 +#: ../dgit:7316 msgid "Import, merging." msgstr "" -#: ../dgit:7082 +#: ../dgit:7330 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7091 +#: ../dgit:7339 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7098 +#: ../dgit:7346 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7104 +#: ../dgit:7352 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7118 +#: ../dgit:7366 msgid "need destination argument" msgstr "" -#: ../dgit:7123 +#: ../dgit:7371 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7131 +#: ../dgit:7379 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7142 +#: ../dgit:7390 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7148 +#: ../dgit:7396 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7155 ../dgit:7161 +#: ../dgit:7403 ../dgit:7409 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7167 +#: ../dgit:7415 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7214 +#: ../dgit:7462 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7253 +#: ../dgit:7501 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7257 +#: ../dgit:7505 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7348 +#: ../dgit:7605 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7368 +#: ../dgit:7620 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7423 +#: ../dgit:7675 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7438 +#: ../dgit:7690 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7442 +#: ../dgit:7694 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7448 +#: ../dgit:7700 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2012,49 +1674,40 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7465 +#: ../dgit:7717 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7478 +#: ../dgit:7730 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7498 +#: ../dgit:7750 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7508 +#: ../dgit:7761 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7513 -msgid "dgit: --include-dirty is not supported in split view quilt mode" -msgstr "" - -#: ../dgit:7524 -#, perl-format -msgid "unknown clean-mode `%s'" -msgstr "" - -#: ../dgit:7545 +#: ../dgit:7789 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7546 +#: ../dgit:7790 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7565 +#: ../dgit:7809 #, perl-format msgid "unknown operation %s" msgstr "" -#: ../git-debrebase:44 +#: ../git-debrebase:45 msgid "" "usages:\n" " git-debrebase [] [--|-i ]\n" @@ -2067,60 +1720,60 @@ msgid "" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" -#: ../git-debrebase:67 +#: ../git-debrebase:68 #, perl-format msgid "%s: bad usage: %s\n" msgstr "" -#: ../git-debrebase:78 +#: ../git-debrebase:79 #, perl-format msgid "bad options follow `git-debrebase %s'" msgstr "" -#: ../git-debrebase:89 +#: ../git-debrebase:90 #, perl-format msgid "missing required git config %s" msgstr "" -#: ../git-debrebase:401 +#: ../git-debrebase:364 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "" -#: ../git-debrebase:404 +#: ../git-debrebase:367 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "" -#: ../git-debrebase:417 +#: ../git-debrebase:380 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" -#: ../git-debrebase:423 +#: ../git-debrebase:386 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "" -#: ../git-debrebase:427 +#: ../git-debrebase:390 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f, or --force)" msgstr "" -#: ../git-debrebase:459 +#: ../git-debrebase:422 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" msgstr "" -#: ../git-debrebase:466 +#: ../git-debrebase:429 #, perl-format msgid "" "%s\n" "Is this meant to be a gdr branch? %s\n" msgstr "" -#: ../git-debrebase:471 +#: ../git-debrebase:434 #, perl-format msgid "" "%s\n" @@ -2128,7 +1781,7 @@ msgid "" "Consider git-debrebase scrap, to throw away your recent work.\n" msgstr "" -#: ../git-debrebase:477 +#: ../git-debrebase:440 #, perl-format msgid "" "%s\n" @@ -2136,7 +1789,7 @@ msgid "" "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" msgstr "" -#: ../git-debrebase:488 +#: ../git-debrebase:451 #, perl-format msgid "" "%s\n" @@ -2144,418 +1797,415 @@ msgid "" "Maybe you reset to, or rebased from, somewhere inappropriate.\n" msgstr "" -#: ../git-debrebase:935 +#: ../git-debrebase:898 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "" -#: ../git-debrebase:937 +#: ../git-debrebase:900 msgid "has other than two parents" msgstr "" -#: ../git-debrebase:938 +#: ../git-debrebase:901 msgid "contains debian/patches" msgstr "" -#: ../git-debrebase:964 +#: ../git-debrebase:927 msgid "is an origin commit" msgstr "" -#: ../git-debrebase:966 +#: ../git-debrebase:929 msgid "upstream files differ from left parent" msgstr "" -#: ../git-debrebase:968 +#: ../git-debrebase:931 msgid "debian/ differs from right parent" msgstr "" -#: ../git-debrebase:979 +#: ../git-debrebase:942 msgid "edits debian/patches" msgstr "" -#: ../git-debrebase:991 +#: ../git-debrebase:954 msgid "parent's debian is not a directory" msgstr "" -#: ../git-debrebase:998 +#: ../git-debrebase:961 msgid "no changes" msgstr "" -#: ../git-debrebase:1004 +#: ../git-debrebase:967 msgid "origin commit" msgstr "" -#: ../git-debrebase:1055 +#: ../git-debrebase:1018 #, perl-format msgid "unknown kind of merge from %s" msgstr "" -#: ../git-debrebase:1058 +#: ../git-debrebase:1021 msgid "octopus merge" msgstr "" -#: ../git-debrebase:1062 +#: ../git-debrebase:1025 msgid "general two-parent merge" msgstr "" -#: ../git-debrebase:1079 +#: ../git-debrebase:1042 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "" -#: ../git-debrebase:1119 +#: ../git-debrebase:1082 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "" -#: ../git-debrebase:1147 +#: ../git-debrebase:1110 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "" -#: ../git-debrebase:1148 +#: ../git-debrebase:1111 #, perl-format msgid " (eg %s)" msgstr "" -#: ../git-debrebase:1154 +#: ../git-debrebase:1117 msgid "found mixed upstream/packaging commit" msgstr "" -#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168 -#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187 +#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 +#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 #, perl-format msgid " (%s)" msgstr "" -#: ../git-debrebase:1162 +#: ../git-debrebase:1125 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "" -#: ../git-debrebase:1167 +#: ../git-debrebase:1130 msgid "found dgit dsc import" msgstr "" -#: ../git-debrebase:1172 +#: ../git-debrebase:1135 msgid "found bare dgit dsc import with no prior history" msgstr "" -#: ../git-debrebase:1178 +#: ../git-debrebase:1141 msgid "found vanilla merge" msgstr "" -#: ../git-debrebase:1185 +#: ../git-debrebase:1148 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1253 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1254 +#: ../git-debrebase:1217 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1375 +#: ../git-debrebase:1338 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1715 ../git-debrebase:1718 +#: ../git-debrebase:1678 ../git-debrebase:1681 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1721 +#: ../git-debrebase:1684 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1731 +#: ../git-debrebase:1694 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1759 +#: ../git-debrebase:1722 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1773 +#: ../git-debrebase:1736 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1799 +#: ../git-debrebase:1762 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1804 +#: ../git-debrebase:1767 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1806 +#: ../git-debrebase:1769 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1841 +#: ../git-debrebase:1802 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../git-debrebase:1804 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1864 +#: ../git-debrebase:1827 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1868 +#: ../git-debrebase:1831 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1872 +#: ../git-debrebase:1835 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1894 +#: ../git-debrebase:1857 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1897 +#: ../git-debrebase:1860 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1925 +#: ../git-debrebase:1888 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1933 +#: ../git-debrebase:1896 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1944 +#: ../git-debrebase:1907 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1964 +#: ../git-debrebase:1927 msgid "fast forward" msgstr "" -#: ../git-debrebase:1974 +#: ../git-debrebase:1937 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1986 +#: ../git-debrebase:1949 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2017 -#, perl-format -msgid "" -"Could not determine appropriate upstream commitish.\n" -" (Tried these tags: %s)\n" -" Check version, and specify upstream commitish explicitly." -msgstr "" - -#: ../git-debrebase:2036 +#: ../git-debrebase:1966 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2041 +#: ../git-debrebase:1971 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2059 +#: ../git-debrebase:1989 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2060 +#: ../git-debrebase:1990 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2080 +#: ../git-debrebase:2010 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2098 +#: ../git-debrebase:2028 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" -#: ../git-debrebase:2114 +#: ../git-debrebase:2044 #, 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:2123 +#: ../git-debrebase:2053 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2136 +#: ../git-debrebase:2066 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2147 +#: ../git-debrebase:2077 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2150 +#: ../git-debrebase:2080 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2153 +#: ../git-debrebase:2083 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2194 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2268 +#: ../git-debrebase:2198 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 -#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 -#: ../git-debrebase:2472 +#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 +#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 +#: ../git-debrebase:2402 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2307 +#: ../git-debrebase:2237 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2308 +#: ../git-debrebase:2238 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2309 +#: ../git-debrebase:2239 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2310 +#: ../git-debrebase:2240 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2320 +#: ../git-debrebase:2250 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2322 +#: ../git-debrebase:2252 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2338 +#: ../git-debrebase:2268 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2344 +#: ../git-debrebase:2274 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2345 +#: ../git-debrebase:2275 msgid "anchor" msgstr "" -#: ../git-debrebase:2346 +#: ../git-debrebase:2276 msgid "breakwater" msgstr "" -#: ../git-debrebase:2351 +#: ../git-debrebase:2281 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2358 +#: ../git-debrebase:2288 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2291 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2363 +#: ../git-debrebase:2293 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2365 +#: ../git-debrebase:2295 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2368 +#: ../git-debrebase:2298 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2385 ../git-debrebase:2398 +#: ../git-debrebase:2315 ../git-debrebase:2328 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2392 ../git-debrebase:2422 +#: ../git-debrebase:2322 ../git-debrebase:2352 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2461 +#: ../git-debrebase:2391 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2478 +#: ../git-debrebase:2408 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2485 +#: ../git-debrebase:2415 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2505 +#: ../git-debrebase:2435 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2510 +#: ../git-debrebase:2440 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2517 +#: ../git-debrebase:2447 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2525 +#: ../git-debrebase:2455 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2530 +#: ../git-debrebase:2460 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2476 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2551 +#: ../git-debrebase:2481 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2567 +#: ../git-debrebase:2497 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2563,58 +2213,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2575 +#: ../git-debrebase:2505 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2582 +#: ../git-debrebase:2512 #, 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:2584 +#: ../git-debrebase:2514 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2591 +#: ../git-debrebase:2521 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2609 +#: ../git-debrebase:2539 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2615 +#: ../git-debrebase:2545 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2548 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2551 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2623 +#: ../git-debrebase:2553 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2625 +#: ../git-debrebase:2555 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2632 +#: ../git-debrebase:2562 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2622,12 +2272,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2678 +#: ../git-debrebase:2608 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2707 +#: ../git-debrebase:2637 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2635,16 +2285,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2728 +#: ../git-debrebase:2658 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2736 +#: ../git-debrebase:2666 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2680 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2652,225 +2302,242 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2754 +#: ../git-debrebase:2684 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2766 +#: ../git-debrebase:2696 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2773 +#: ../git-debrebase:2703 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2779 +#: ../git-debrebase:2709 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2788 +#: ../git-debrebase:2718 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2794 +#: ../git-debrebase:2724 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2825 +#: ../git-debrebase:2755 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2834 +#: ../git-debrebase:2764 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2871 +#: ../git-debrebase:2801 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2880 +#: ../git-debrebase:2810 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2894 +#: ../git-debrebase:2824 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:2900 +#: ../git-debrebase:2830 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2837 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2911 +#: ../git-debrebase:2841 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3013 +#: ../git-debrebase:2943 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3023 +#: ../git-debrebase:2953 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3053 +#: ../git-debrebase:2983 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:295 +#: ../Debian/Dgit.pm:293 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:315 +#: ../Debian/Dgit.pm:319 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:334 +#: ../Debian/Dgit.pm:338 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:336 +#: ../Debian/Dgit.pm:340 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:339 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:347 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:349 +#: ../Debian/Dgit.pm:353 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:355 +#: ../Debian/Dgit.pm:359 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:357 +#: ../Debian/Dgit.pm:361 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:363 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:450 +#: ../Debian/Dgit.pm:454 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:460 +#: ../Debian/Dgit.pm:464 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:479 +#: ../Debian/Dgit.pm:483 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:485 +#: ../Debian/Dgit.pm:489 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:506 +#: ../Debian/Dgit.pm:510 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:513 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:617 +#: ../Debian/Dgit.pm:621 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:618 +#: ../Debian/Dgit.pm:622 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:689 +#: ../Debian/Dgit.pm:644 +msgid "using specified upstream commitish" +msgstr "" + +#: ../Debian/Dgit.pm:650 +#, perl-format +msgid "" +"Could not determine appropriate upstream commitish.\n" +" (Tried these tags: %s)\n" +" Check version, and specify upstream commitish explicitly." +msgstr "" + +#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#, perl-format +msgid "using upstream from git tag %s" +msgstr "" + +#: ../Debian/Dgit.pm:764 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:690 +#: ../Debian/Dgit.pm:765 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:706 +#: ../Debian/Dgit.pm:781 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:715 +#: ../Debian/Dgit.pm:790 #, 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:729 +#: ../Debian/Dgit.pm:804 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:750 +#: ../Debian/Dgit.pm:825 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:911 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:843 +#: ../Debian/Dgit.pm:932 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:1000 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:934 +#: ../Debian/Dgit.pm:1023 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:942 +#: ../Debian/Dgit.pm:1031 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:951 +#: ../Debian/Dgit.pm:1040 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4aad97d3..8e5129de 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"POT-Creation-Date: 2019-07-21 00:36+0000\n" "PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -19,79 +19,79 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:242 +#: ../dgit:264 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:249 +#: ../dgit:271 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:257 +#: ../dgit:279 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:262 +#: ../dgit:284 #, 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:487 +#: ../dgit:516 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:492 ../dgit:498 +#: ../dgit:521 ../dgit:527 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:493 +#: ../dgit:522 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:501 +#: ../dgit:530 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:508 +#: ../dgit:537 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:516 +#: ../dgit:545 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:537 +#: ../dgit:566 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:540 +#: ../dgit:569 msgid "data block" msgstr "gegevensblok" -#: ../dgit:621 +#: ../dgit:650 #, perl-format msgid "failed to fetch %s: %s" msgstr "ophalen (fetch) van %s mislukt: %s" -#: ../dgit:633 +#: ../dgit:662 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:635 +#: ../dgit:664 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:660 +#: ../dgit:689 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -131,13 +131,13 @@ msgstr "" " -c= configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:679 +#: ../dgit:708 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:683 +#: ../dgit:712 #, perl-format msgid "" "%s: %s\n" @@ -146,22 +146,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:688 +#: ../dgit:717 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:799 +#: ../dgit:833 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:802 +#: ../dgit:836 #, 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:822 +#: ../dgit:856 #, perl-format msgid "" "need value for one of: %s\n" @@ -170,39 +170,45 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:863 +#: ../dgit:897 #, 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:878 +#: ../dgit:912 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:894 +#: ../dgit:928 #, 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:914 +#: ../dgit:948 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:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:966 +#, 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 msgid "internal error" msgstr "interne fout" -#: ../dgit:925 +#: ../dgit:973 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:929 +#: ../dgit:977 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -211,13 +217,20 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1094 +#: ../dgit:1000 +#, perl-format +msgid "" +"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " +"set to `%s'" +msgstr "" + +#: ../dgit:1163 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:1140 +#: ../dgit:1209 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " @@ -226,68 +239,68 @@ msgstr "" "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl " "ertoe te brengen exact die EE-sleutel (%s) te gebruiken" -#: ../dgit:1161 +#: ../dgit:1230 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1169 +#: ../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:1173 +#: ../dgit:1242 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1189 +#: ../dgit:1258 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1193 +#: ../dgit:1262 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1195 +#: ../dgit:1264 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1197 +#: ../dgit:1266 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1199 ../dgit:1224 +#: ../dgit:1268 ../dgit:1293 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1213 +#: ../dgit:1282 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1215 +#: ../dgit:1284 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1218 +#: ../dgit:1287 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1220 +#: ../dgit:1289 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1271 +#: ../dgit:1340 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1355 +#: ../dgit:1424 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -300,21 +313,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1377 +#: ../dgit:1448 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1405 +#: ../dgit:1474 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1406 +#: ../dgit:1475 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1511 +#: ../dgit:1580 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -323,138 +336,138 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1702 +#: ../dgit:1719 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1705 +#: ../dgit:1722 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1707 +#: ../dgit:1724 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1727 +#: ../dgit:1744 #, 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:1733 +#: ../dgit:1750 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1760 +#: ../dgit:1777 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1777 +#: ../dgit:1794 msgid "unexpected results from git check query - " msgstr "het verzoek git check leverde onverwachte resultaten op - " -#: ../dgit:1792 +#: ../dgit:1809 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1807 +#: ../dgit:1824 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1844 +#: ../dgit:1861 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1890 +#: ../dgit:1907 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1901 +#: ../dgit:1918 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1947 +#: ../dgit:1964 #, 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:1956 +#: ../dgit:1973 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1960 +#: ../dgit:1977 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1966 +#: ../dgit:1983 #, 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:2006 +#: ../dgit:2023 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2019 +#: ../dgit:2036 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2032 +#: ../dgit:2049 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:2048 +#: ../dgit:2065 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2053 +#: ../dgit:2070 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2061 +#: ../dgit:2078 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2068 +#: ../dgit:2085 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2096 +#: ../dgit:2113 #, 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:2104 +#: ../dgit:2121 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2107 +#: ../dgit:2124 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2131 +#: ../dgit:2143 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -463,7 +476,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2154 +#: ../dgit:2166 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -490,7 +503,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2166 +#: ../dgit:2178 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -498,24 +511,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2197 +#: ../dgit:2209 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2199 +#: ../dgit:2211 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2201 +#: ../dgit:2213 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2206 +#: ../dgit:2218 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2231 +#: ../dgit:2243 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -523,85 +536,80 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2235 +#: ../dgit:2247 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2237 +#: ../dgit:2249 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2240 +#: ../dgit:2252 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2249 +#: ../dgit:2261 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2253 +#: ../dgit:2265 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2256 +#: ../dgit:2268 #, 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:2262 +#: ../dgit:2274 #, 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:2294 ../dgit:2299 -#, perl-format -msgid "accessing %s: %s" -msgstr "bezig met benaderen van %s: %s" - -#: ../dgit:2314 ../dgit:2321 -#, perl-format -msgid "saving %s: %s" -msgstr "bezig met opslaan van %s: %s" - -#: ../dgit:2386 +#: ../dgit:2345 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2450 ../dgit:5974 -msgid "source package" -msgstr "broncodepakket" - -#: ../dgit:2468 +#: ../dgit:2407 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2508 +#: ../dgit:2447 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2527 +#: ../dgit:2516 ../dgit:2521 #, perl-format -msgid "Import %s" -msgstr "Importeren van %s" +msgid "accessing %s: %s" +msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2608 +#: ../dgit:2536 ../dgit:2543 +#, perl-format +msgid "saving %s: %s" +msgstr "bezig met opslaan van %s: %s" + +#: ../dgit:2569 ../dgit:6035 +msgid "source package" +msgstr "broncodepakket" + +#: ../dgit:2647 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2627 +#: ../dgit:2666 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2636 +#: ../dgit:2675 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -614,21 +622,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2651 +#: ../dgit:2690 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2655 +#: ../dgit:2694 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2668 -#, perl-format -msgid "Record %s (%s) in archive suite %s\n" -msgstr "Gegeven %s (%s) uit archiefsuite %s\n" - -#: ../dgit:2672 +#: ../dgit:2714 #, perl-format msgid "" "\n" @@ -641,12 +644,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2714 +#: ../dgit:2756 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2718 +#: ../dgit:2760 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -655,12 +658,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2722 +#: ../dgit:2764 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2738 +#: ../dgit:2780 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -668,24 +671,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2833 +#: ../dgit:2875 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2848 +#: ../dgit:2890 #, 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:2892 +#: ../dgit:2934 #, 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:2907 +#: ../dgit:2949 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" @@ -695,7 +698,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run.\n" -#: ../dgit:2912 +#: ../dgit:2954 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -711,44 +714,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2979 -#, perl-format -msgid "Not updating %s from %s to %s.\n" -msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" - -#: ../dgit:3028 -#, perl-format -msgid "%s: NO git hash" -msgstr "%s: GEEN hash van git" - -#: ../dgit:3032 -#, perl-format -msgid "%s: specified git info (%s)" -msgstr "%s: git info werd opgegeven (%s)" - -#: ../dgit:3039 -#, perl-format -msgid "%s: specified git hash" -msgstr "%s: git hash werd opgegeven" - -#: ../dgit:3041 -#, perl-format -msgid "%s: invalid Dgit info" -msgstr "%s: ongeldige Dgit info" - -#: ../dgit:3063 +#: ../dgit:3101 #, 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:3068 +#: ../dgit:3106 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3073 +#: ../dgit:3111 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -757,7 +735,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:3083 +#: ../dgit:3121 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -770,30 +748,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:3103 +#: ../dgit:3141 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3110 +#: ../dgit:3148 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:3114 +#: ../dgit:3152 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3116 +#: ../dgit:3154 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:3123 +#: ../dgit:3161 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3126 +#: ../dgit:3164 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -802,27 +780,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3151 +#: ../dgit:3189 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3155 +#: ../dgit:3193 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3238 +#: ../dgit:3276 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3245 +#: ../dgit:3283 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3250 +#: ../dgit:3288 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3278 +#: ../dgit:3316 #, perl-format msgid "" "\n" @@ -838,15 +816,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3291 +#: ../dgit:3329 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3294 +#: ../dgit:3332 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3315 +#: ../dgit:3353 #, perl-format msgid "" "\n" @@ -858,7 +836,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3324 +#: ../dgit:3362 #, perl-format msgid "" "\n" @@ -873,7 +851,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3409 +#: ../dgit:3447 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -884,19 +862,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3422 +#: ../dgit:3460 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3440 +#: ../dgit:3478 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3442 +#: ../dgit:3480 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3453 +#: ../dgit:3491 #, perl-format msgid "" "\n" @@ -912,15 +890,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3468 +#: ../dgit:3506 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3504 +#: ../dgit:3542 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3569 +#: ../dgit:3607 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -928,16 +906,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3583 +#: ../dgit:3621 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:3598 +#: ../dgit:3636 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3625 +#: ../dgit:3663 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -948,32 +926,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3647 +#: ../dgit:3685 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3655 +#: ../dgit:3693 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3694 +#: ../dgit:3732 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3726 +#: ../dgit:3764 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3728 +#: ../dgit:3766 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:3767 +#: ../dgit:3805 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -984,7 +962,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3781 +#: ../dgit:3819 msgid "" "\n" "Key\n" @@ -998,34 +976,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3796 +#: ../dgit:3834 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3814 +#: ../dgit:3852 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3822 +#: ../dgit:3860 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3837 +#: ../dgit:3875 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3853 +#: ../dgit:3891 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3857 +#: ../dgit:3895 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3883 +#: ../dgit:3921 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -1035,33 +1013,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3888 +#: ../dgit:3926 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3900 +#: ../dgit:3938 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3902 +#: ../dgit:3940 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3910 +#: ../dgit:3948 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3921 +#: ../dgit:3959 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:3940 +#: ../dgit:3978 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1070,15 +1048,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:3957 +#: ../dgit:3995 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3960 +#: ../dgit:3998 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3964 +#: ../dgit:4002 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1086,7 +1064,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4007 +#: ../dgit:4045 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1094,60 +1072,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4012 +#: ../dgit:4050 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4022 +#: ../dgit:4060 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4028 +#: ../dgit:4066 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4054 +#: ../dgit:4092 #, 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:4057 +#: ../dgit:4095 #, 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:4065 +#: ../dgit:4103 #, 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:4074 +#: ../dgit:4112 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4083 +#: ../dgit:4121 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4091 +#: ../dgit:4129 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4101 +#: ../dgit:4140 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4104 +#: ../dgit:4143 #, perl-format msgid "" "%s is %s\n" @@ -1156,547 +1134,99 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4118 +#: ../dgit:4157 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4174 +#: ../dgit:4213 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4183 +#: ../dgit:4222 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4185 +#: ../dgit:4224 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4186 +#: ../dgit:4225 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4199 +#: ../dgit:4238 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:4209 +#: ../dgit:4248 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4210 +#: ../dgit:4249 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4214 +#: ../dgit:4253 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4227 +#: ../dgit:4266 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4235 +#: ../dgit:4274 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4247 +#: ../dgit:4286 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4269 +#: ../dgit:4308 #, 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:4330 +#: ../dgit:4362 #, 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:4358 -#, perl-format -msgid "%s release %s for %s (%s) [dgit]\n" -msgstr "%s release %s voor %s (%s) [dgit]\n" - -#: ../dgit:4371 -#, perl-format -msgid "" -"%s release %s for %s (%s)\n" -"(maintainer view tag generated by dgit --quilt=%s)\n" -msgstr "" -"%s release %s voor %s (%s)\n" -"(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" - -#: ../dgit:4423 -msgid "" -"Push failed, while checking state of the archive.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" -"Push mislukte tijdens het nagaan van de toestand van het archief.\n" -"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " -"probleem.\n" - -#: ../dgit:4432 -msgid "" -"package appears to be new in this suite; if this is intentional, use --new" -msgstr "" -"het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, " -"gebruik dan --new" - -#: ../dgit:4437 -msgid "" -"Push failed, while preparing your push.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" -"Push mislukte tijdens het voorbereiden van uw push.\n" -"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " -"probleem.\n" - -#: ../dgit:4460 -#, perl-format -msgid "looked for .dsc %s, but %s; maybe you forgot to build" -msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen" - -#: ../dgit:4477 -#, perl-format -msgid "" -"Branch is managed by git-debrebase (%s\n" -"exists), but quilt mode (%s) implies a split view.\n" -"Pass the right --quilt option or adjust your git config.\n" -"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" -msgstr "" -"Tak wordt beheerd door git-debrebase (%s\n" -"bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n" -"Gebruik de juiste --quilt-optie of pas uw git config aan.\n" -"Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" - -#: ../dgit:4501 -#, perl-format -msgid "" -"--quilt=%s but no cached dgit view:\n" -" perhaps HEAD changed since dgit build[-source] ?" -msgstr "" -"--quilt=%s maar geen gecachete dgit-weergave:\n" -" werd HEAD misschien gewijzigd sinds dgit build[-source]?" - -#: ../dgit:4532 -msgid "" -"dgit push: HEAD is not a descendant of the archive's version.\n" -"To overwrite the archive's contents, pass --overwrite[=VERSION].\n" -"To rewind history, if permitted by the archive, use --deliberately-not-fast-" -"forward." -msgstr "" -"dgit push: HEAD is geen afstammeling van de versie van het archief.\n" -"Om de inhoud van het archief te overschrijven, geeft u de opdracht --" -"overwrite[=VERSIE].\n" -"Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " -"u --deliberately-not-fast-forward." - -#: ../dgit:4542 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "bezig na te gaan dat %s overeenkomt met HEAD" - -#: ../dgit:4576 ../dgit:4588 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "HEAD geeft een andere boom op aan %s:\n" - -#: ../dgit:4582 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" -"Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n" -"Om alle verschillen te zien, gebruikt u git diff %s %s\n" - -#: ../dgit:4592 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" -"Misschien vergat u te bouwen (build). Of er is misschien een probleem met\n" -" uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te " -"zien,\n" -" gebruikt u git diff %s %s\n" - -#: ../dgit:4603 -#, perl-format -msgid "" -"failed to find unique changes file (looked for %s in %s); perhaps you need " -"to use dgit -C" -msgstr "" -"kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " -"u dgit -C gebruiken" - -#: ../dgit:4625 -msgid "uploading binaries, although distro policy is source only" -msgstr "" -"bezig met uploaden van binaire pakketten, hoewel het beleid van de " -"distributie uitsluitend broncode (source only) voorschrijft" - -#: ../dgit:4629 -msgid "source-only upload, although distro policy requires .debs" -msgstr "" -"upload van uitsluitend broncode (source-only), hoewel het beleid van de " -"distributie .deb's vereist" - -#: ../dgit:4633 -#, perl-format -msgid "" -"source-only upload, even though package is entirely NEW\n" -"(this is contrary to policy in %s)" -msgstr "" -"upload van uitsluitend broncode (source-only), hoewel pakket volledig NIEUW " -"is\n" -"(dit is in tegenspraak met de beleidsrichtlijnen in %s)" - -#: ../dgit:4640 -#, perl-format -msgid "unknown source-only-uploads policy `%s'" -msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" - -#: ../dgit:4684 -msgid "" -"Push failed, while signing the tag.\n" -"You can retry the push, after fixing the problem, if you like.\n" -msgstr "" -"Push mislukte tijdens het ondertekenen van de tag.\n" -"Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " -"probleem.\n" - -#: ../dgit:4697 -msgid "" -"Push failed, *after* signing the tag.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" -"Push mislukte *na* het ondertekenen van de tag.\n" -"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " -"gebruiken.\n" - -#: ../dgit:4714 -msgid "" -"Push failed, while updating the remote git repository - see messages above.\n" -"If you want to try again, you should use a new version number.\n" -msgstr "" -"Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie de " -"meldingen hierboven.\n" -"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " -"gebruiken.\n" - -#: ../dgit:4731 -msgid "" -"Push failed, while obtaining signatures on the .changes and .dsc.\n" -"If it was just that the signature failed, you may try again by using\n" -"debsign by hand to sign the changes file (see the command dgit tried,\n" -"above), and then dput that changes file to complete the upload.\n" -"If you need to change the package, you must use a new version number.\n" -msgstr "" -"Push mislukte bij het verkrijgen van de ondertekening van .changes en .dsc.\n" -"Indien het louter een mislukte ondertekening betreft, kunt u opnieuw " -"proberen\n" -"door handmatig het changes-bestand te ondertekenen met debsign (zie " -"hierboven\n" -"welk commando dgit gebruikte) en vervolgens het changes-bestand te uploaden\n" -"met dput om zo de upload te vervolledigen.\n" -"Indien u het pakket moet aanpassen, moet u een nieuw versienummer " -"gebruiken.\n" - -#: ../dgit:4762 -#, perl-format -msgid "pushed and uploaded %s" -msgstr "%s gepusht en geüpload" - -#: ../dgit:4774 -msgid "-p is not allowed with clone; specify as argument instead" -msgstr "" -"-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als " -"argument" - -#: ../dgit:4785 -msgid "incorrect arguments to dgit clone" -msgstr "incorrecte argumenten voor dgit clone" - -#: ../dgit:4791 ../git-debrebase:1839 -#, perl-format -msgid "%s already exists" -msgstr "%s bestaat reeds" - -#: ../dgit:4805 -#, perl-format -msgid "remove %s: %s\n" -msgstr "verwijder %s: %s\n" - -#: ../dgit:4809 -#, perl-format -msgid "check whether to remove %s: %s\n" -msgstr "controleer of %s moet verwijderd worden: %s\n" - -#: ../dgit:4847 -msgid "incorrect arguments to dgit fetch or dgit pull" -msgstr "incorrecte argumenten voor dgit fetch of dgit pull" - -#: ../dgit:4864 -#, perl-format -msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" -msgstr "" -"dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet " -"ondersteund\n" - -#: ../dgit:4873 -msgid "dgit checkout needs a suite argument" -msgstr "dgit checkout heeft een suite nodig als argument" - -#: ../dgit:4935 -#, perl-format -msgid "setting up vcs-git: %s\n" -msgstr "bezig met opzetten van vcs-git: %s\n" - -#: ../dgit:4938 -#, perl-format -msgid "vcs git already configured: %s\n" -msgstr "vcs git is reeds geconfigureerd: %s\n" - -#: ../dgit:4940 -#, perl-format -msgid "changing vcs-git url to: %s\n" -msgstr "url van vcs-git wordt veranderd naar: %s\n" - -#: ../dgit:4945 -#, perl-format -msgid "fetching (%s)\n" -msgstr "bezig met ophalen (%s)\n" - -#: ../dgit:4960 -#, perl-format -msgid "incorrect arguments to dgit %s" -msgstr "incorrecte argumenten voor dgit %s" - -#: ../dgit:4971 -#, perl-format -msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" -msgstr "" -"dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel " -"wordt %s opgegeven" - -#: ../dgit:5009 -#, perl-format -msgid "" -"build host has dgit rpush protocol versions %s but invocation host has %s" -msgstr "" -"de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " -"de aanroepende computer zijn %s" - -#: ../dgit:5089 -#, perl-format -msgid "create %s: %s" -msgstr "maak %s aan: %s" - -#: ../dgit:5126 -#, perl-format -msgid "build host child failed: %s" -msgstr "dochterproces op de bouwcomputer faalde: %s" - -#: ../dgit:5129 -msgid "all done\n" -msgstr "alles klaar\n" - -#: ../dgit:5138 -#, perl-format -msgid "file %s (%s) twice" -msgstr "bestand %s (%s) tweemaal" - -#: ../dgit:5146 -msgid "bad param spec" -msgstr "slechte parameter-spec" - -#: ../dgit:5152 -msgid "bad previously spec" -msgstr "slechte vroegere spec" - -#: ../dgit:5171 -#, perl-format -msgid "" -"rpush negotiated protocol version %s which does not support quilt mode %s" -msgstr "" -"de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " -"%s niet ondersteunt" - -#: ../dgit:5216 -#, perl-format -msgid "buildinfo mismatch in field %s" -msgstr "buildinfo-incongruentie in veld %s" - -#: ../dgit:5219 -#, perl-format -msgid "buildinfo contains forbidden field %s" -msgstr "buildinfo bevat ongeoorloofd veld %s" - -#: ../dgit:5260 -msgid "remote changes file" -msgstr "extern changes-bestand" - -#: ../dgit:5335 -msgid "not a plain file or symlink\n" -msgstr "geen echt bestand of symbolische koppeling\n" - -#: ../dgit:5341 -msgid "mode or type changed\n" -msgstr "modus of type gewijzigd\n" - -#: ../dgit:5342 -msgid "modified symlink\n" -msgstr "symbolische koppeling gewijzigd\n" - -#: ../dgit:5345 -msgid "deletion of symlink\n" -msgstr "verwijdering van symbolische koppeling\n" - -#: ../dgit:5349 -msgid "creation with non-default mode\n" -msgstr "creatie met een niet-standaard modus\n" - -#: ../dgit:5379 -msgid "dgit view: changes are required..." -msgstr "dgit-weergave: er zijn wijzigingen vereist..." - -#: ../dgit:5408 -#, perl-format -msgid "" -"\n" -"For full diff showing the problem(s), type:\n" -" %s\n" -msgstr "" -"\n" -"Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" -" %s\n" - -#: ../dgit:5415 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-unapplied git tree\n" -" but git tree differs from orig in upstream files." -msgstr "" -"--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n" -" (een git-boom zonder dat de patches toegepast worden)\n" -" maar de git-boom verschilt van orig in de toeleveraarsbestanden." - -#: ../dgit:5421 -msgid "" -"\n" -" ... debian/patches is missing; perhaps this is a patch queue branch?" -msgstr "" -"\n" -" ... debian/patches ontbreekt; is dit misschien een tak met een patch-" -"wachtrij?" - -#: ../dgit:5428 -#, perl-format -msgid "" -"--quilt=%s specified, implying patches-applied git tree\n" -" but git tree differs from result of applying debian/patches to upstream\n" -msgstr "" -"--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n" -" (een git-boom met toegepaste patches)\n" -" maar de git-boom verschilt van het resultaat van het toepassen van\n" -" debian/patches op de broncode van de toeleveraar.\n" - -#: ../dgit:5435 -msgid "dgit view: creating patches-applied version using gbp pq" -msgstr "" -"dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" - -#: ../dgit:5444 -#, perl-format -msgid "" -"--quilt=%s specified, implying that HEAD is for use with a\n" -" tool which does not create patches for changes to upstream\n" -" .gitignores: but, such patches exist in debian/patches.\n" -msgstr "" -"--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om gebruikt\n" -" te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n" -" toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n" - -#: ../dgit:5453 -msgid "dgit view: creating patch to represent .gitignore changes" -msgstr "" -"dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " -"representeren" - -#: ../dgit:5458 -#, perl-format -msgid "%s already exists; but want to create it to record .gitignore changes" -msgstr "" -"%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op " -"te tekenen" - -#: ../dgit:5463 -msgid "" -"Subject: Update .gitignore from Debian packaging branch\n" -"\n" -"The Debian packaging git branch contains these updates to the upstream\n" -".gitignore file(s). This patch is autogenerated, to provide these\n" -"updates to users of the official Debian archive view of the package.\n" -msgstr "" -"Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n" -"\n" -"De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n" -".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n" -"gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n" -"de weergave van het pakket uit het officiële Debian-archief.\n" - -#: ../dgit:5485 -msgid "Commit patch to update .gitignore\n" -msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" - -#: ../dgit:5499 -msgid "converted" -msgstr "omgezet" - -#: ../dgit:5500 -#, perl-format -msgid "dgit view: created (%s)" -msgstr "dgit-weergave: gecreëerd: (%s)" - -#: ../dgit:5565 +#: ../dgit:5607 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5583 +#: ../dgit:5625 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5592 +#: ../dgit:5634 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5598 +#: ../dgit:5640 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5610 +#: ../dgit:5652 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5629 +#: ../dgit:5671 #, perl-format msgid "" "\n" @@ -1705,23 +1235,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5636 +#: ../dgit:5678 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5648 +#: ../dgit:5690 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:5651 +#: ../dgit:5693 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5663 +#: ../dgit:5705 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1732,72 +1262,88 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5670 +#: ../dgit:5712 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5704 +#: ../dgit:5746 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5705 +#: ../dgit:5747 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5706 +#: ../dgit:5748 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5707 +#: ../dgit:5749 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5708 +#: ../dgit:5750 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5712 +#: ../dgit:5754 #, 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:5741 +#: ../dgit:5783 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" +#: ../dgit:5866 +#, perl-format +msgid "" +"quilt mode %s does not make sense (or is not supported) with single-debian-" +"patch" +msgstr "" + #: ../dgit:5884 +msgid "converted" +msgstr "omgezet" + +#: ../dgit:5885 +#, perl-format +msgid "dgit view: created (%s)" +msgstr "dgit-weergave: gecreëerd: (%s)" + +#: ../dgit:5939 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5894 +#: ../dgit:5949 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5996 +#: ../dgit:6059 #, 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:6027 +#: ../dgit:6091 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6032 +#: ../dgit:6096 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6043 +#: ../dgit:6131 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6134 +#: ../dgit:6245 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1811,67 +1357,96 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6148 +#: ../dgit:6259 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6185 +#: ../dgit:6293 +msgid "baredebian quilt fixup: could not find any origs" +msgstr "" + +#: ../dgit:6306 +msgid "tarball" +msgstr "" + +#: ../dgit:6324 +#, perl-format +msgid "Combine orig tarballs for %s %s" +msgstr "" + +#: ../dgit:6340 +msgid "tarballs" +msgstr "" + +#: ../dgit:6354 +msgid "upstream" +msgstr "" + +#: ../dgit:6378 #, 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:6188 -#, perl-format +#: ../dgit:6388 +#, fuzzy, perl-format +#| msgid "" +#| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" +#| "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" -"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" +"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" 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:6194 +#: ../dgit:6397 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6198 +#: ../dgit:6401 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:6205 +#: ../dgit:6408 +msgid "" +"This has only a debian/ directory; you probably want --quilt=bare debian." +msgstr "" + +#: ../dgit:6412 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6208 +#: ../dgit:6415 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6211 +#: ../dgit:6418 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:6214 +#: ../dgit:6421 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6218 +#: ../dgit:6425 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:6227 +#: ../dgit:6436 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6265 +#: ../dgit:6475 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1886,13 +1461,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6277 +#: ../dgit:6487 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:6306 +#: ../dgit:6516 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" @@ -1904,18 +1479,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6318 +#: ../dgit:6528 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6321 +#: ../dgit:6531 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:6324 +#: ../dgit:6534 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1923,80 +1498,108 @@ 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:6342 +#: ../dgit:6547 +#, perl-format +msgid "" +"quilt mode %s (generally needs untracked upstream files)\n" +"contradicts clean mode %s (which would delete them)\n" +msgstr "" + +#: ../dgit:6564 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6356 +#: ../dgit:6578 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6369 -#, perl-format -msgid "-p is not allowed with dgit %s" -msgstr "-p is niet toegestaan met dgit %s" +#: ../dgit:6597 +#, 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:6408 +#: ../dgit:6607 +#, fuzzy +#| msgid "dgit: --include-dirty is not supported in split view quilt mode" +msgid "" +"dgit: --include-dirty is not supported with split view (including with view-" +"splitting quilt modes)" +msgstr "" +"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " +"weergave" + +#: ../dgit:6616 +#, fuzzy, perl-format +#| msgid "dgit: import-dsc: %s" +msgid "dgit: --quilt=%s, %s" +msgstr "dgit: import-dsc: %s" + +#: ../dgit:6620 +msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" +msgstr "" + +#: ../dgit:6655 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6410 +#: ../dgit:6657 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6436 +#: ../dgit:6683 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:6442 +#: ../dgit:6689 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6445 +#: ../dgit:6692 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:6488 +#: ../dgit:6735 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6526 +#: ../dgit:6773 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6533 +#: ../dgit:6780 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6540 +#: ../dgit:6787 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6544 +#: ../dgit:6791 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6549 +#: ../dgit:6796 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6552 +#: ../dgit:6799 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6565 +#: ../dgit:6812 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2008,11 +1611,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6583 +#: ../dgit:6830 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6590 +#: ../dgit:6837 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2023,30 +1626,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6700 +#: ../dgit:6947 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6735 +#: ../dgit:6984 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6755 +#: ../dgit:7004 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6768 +#: ../dgit:7017 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6772 +#: ../dgit:7021 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6779 +#: ../dgit:7028 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2054,21 +1657,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6785 +#: ../dgit:7034 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6787 +#: ../dgit:7036 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6807 ../dgit:6809 +#: ../dgit:7056 ../dgit:7058 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6822 +#: ../dgit:7071 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" @@ -2077,7 +1680,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6834 +#: ../dgit:7083 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2085,7 +1688,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6838 +#: ../dgit:7087 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2094,65 +1697,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6868 +#: ../dgit:7117 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6890 +#: ../dgit:7138 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6892 +#: ../dgit:7140 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6905 +#: ../dgit:7153 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6909 +#: ../dgit:7157 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6913 +#: ../dgit:7161 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6930 +#: ../dgit:7178 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6935 +#: ../dgit:7183 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6937 +#: ../dgit:7185 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6948 +#: ../dgit:7196 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6951 +#: ../dgit:7199 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6962 +#: ../dgit:7210 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6973 +#: ../dgit:7221 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:6982 +#: ../dgit:7230 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2163,21 +1766,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:6989 +#: ../dgit:7237 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6991 +#: ../dgit:7239 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6996 +#: ../dgit:7244 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7001 +#: ../dgit:7249 #, perl-format msgid "" "Branch %s already exists\n" @@ -2189,93 +1792,93 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7021 +#: ../dgit:7269 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7023 +#: ../dgit:7271 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7031 +#: ../dgit:7279 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7050 +#: ../dgit:7298 #, 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:7054 +#: ../dgit:7302 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7055 +#: ../dgit:7303 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7066 +#: ../dgit:7314 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7068 +#: ../dgit:7316 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7082 +#: ../dgit:7330 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7091 +#: ../dgit:7339 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7098 +#: ../dgit:7346 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7104 +#: ../dgit:7352 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7118 +#: ../dgit:7366 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7123 +#: ../dgit:7371 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7131 +#: ../dgit:7379 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url" -#: ../dgit:7142 +#: ../dgit:7390 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7148 +#: ../dgit:7396 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7155 ../dgit:7161 +#: ../dgit:7403 ../dgit:7409 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7167 +#: ../dgit:7415 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7214 +#: ../dgit:7462 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2283,42 +1886,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7253 +#: ../dgit:7501 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7257 +#: ../dgit:7505 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7348 +#: ../dgit:7605 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7368 +#: ../dgit:7620 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7423 +#: ../dgit:7675 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7438 +#: ../dgit:7690 #, 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:7442 +#: ../dgit:7694 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7448 +#: ../dgit:7700 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2329,53 +1932,42 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7465 +#: ../dgit:7717 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7478 +#: ../dgit:7730 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7498 +#: ../dgit:7750 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7508 +#: ../dgit:7761 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7513 -msgid "dgit: --include-dirty is not supported in split view quilt mode" -msgstr "" -"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " -"weergave" - -#: ../dgit:7524 -#, perl-format -msgid "unknown clean-mode `%s'" -msgstr "onbekende clean-modus `%s'" - -#: ../dgit:7545 +#: ../dgit:7789 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7546 +#: ../dgit:7790 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7565 +#: ../dgit:7809 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" -#: ../git-debrebase:44 +#: ../git-debrebase:45 msgid "" "usages:\n" " git-debrebase [] [--|-i ]\n" @@ -2397,50 +1989,50 @@ msgstr "" " ...\n" "Zie git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" -#: ../git-debrebase:67 +#: ../git-debrebase:68 #, perl-format msgid "%s: bad usage: %s\n" msgstr "%s: foutief gebruik: %s\n" -#: ../git-debrebase:78 +#: ../git-debrebase:79 #, perl-format msgid "bad options follow `git-debrebase %s'" msgstr "foutieve opties volgen na `git-debrebase %s'" -#: ../git-debrebase:89 +#: ../git-debrebase:90 #, perl-format msgid "missing required git config %s" msgstr "de vereiste git-configuratie %s ontbreekt" -#: ../git-debrebase:401 +#: ../git-debrebase:364 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "%s: moeilijkheid (snag) genegeerd (-f%s): %s\n" -#: ../git-debrebase:404 +#: ../git-debrebase:367 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "%s: moeilijkheid (snag) gevonden (-f%s): %s\n" -#: ../git-debrebase:417 +#: ../git-debrebase:380 #, 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:423 +#: ../git-debrebase:386 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "%s: moeilijkheden (snags): %d overschreven door het globale --force\n" -#: ../git-debrebase:427 +#: ../git-debrebase:390 #, 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:459 +#: ../git-debrebase:422 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" @@ -2448,7 +2040,7 @@ msgstr "" "Tak/geschiedenis lijkt verknoeid - niet langer in gdr-indeling.\n" "Zie ILLEGAL OPERATIONS (ongeldige bewerkingen) in git-debrebase(5).\n" -#: ../git-debrebase:466 +#: ../git-debrebase:429 #, perl-format msgid "" "%s\n" @@ -2457,7 +2049,7 @@ msgstr "" "%s\n" "Zou dit een gdr-tak moeten zijn? %s\n" -#: ../git-debrebase:471 +#: ../git-debrebase:434 #, perl-format msgid "" "%s\n" @@ -2468,7 +2060,7 @@ msgstr "" "%s\n" "Overweeg git-debrebase scrap, om uw recent werk weg te gooien.\n" -#: ../git-debrebase:477 +#: ../git-debrebase:440 #, perl-format msgid "" "%s\n" @@ -2479,7 +2071,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:488 +#: ../git-debrebase:451 #, perl-format msgid "" "%s\n" @@ -2491,260 +2083,254 @@ msgstr "" "Misschien voerde u een reset naar of een rebase van een ongepaste plaats " "uit.\n" -#: ../git-debrebase:935 +#: ../git-debrebase:898 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "git-debrebase `anker' maar %s" -#: ../git-debrebase:937 +#: ../git-debrebase:900 msgid "has other than two parents" msgstr "heeft iets anders dan twee ouders" -#: ../git-debrebase:938 +#: ../git-debrebase:901 msgid "contains debian/patches" msgstr "bevat debian/patches" -#: ../git-debrebase:964 +#: ../git-debrebase:927 msgid "is an origin commit" msgstr "is een externe vastlegging (origin commit)" -#: ../git-debrebase:966 +#: ../git-debrebase:929 msgid "upstream files differ from left parent" msgstr "bestanden van de toeleveraar verschillen van de linkerouder" -#: ../git-debrebase:968 +#: ../git-debrebase:931 msgid "debian/ differs from right parent" msgstr "debian/ verschilt van de rechterouder" -#: ../git-debrebase:979 +#: ../git-debrebase:942 msgid "edits debian/patches" msgstr "bewerkt debian/patches" -#: ../git-debrebase:991 +#: ../git-debrebase:954 msgid "parent's debian is not a directory" msgstr "bij de ouder is debian geen map" -#: ../git-debrebase:998 +#: ../git-debrebase:961 msgid "no changes" msgstr "geen wijzigingen" -#: ../git-debrebase:1004 +#: ../git-debrebase:967 msgid "origin commit" msgstr "externe vastlegging (origin commit)" -#: ../git-debrebase:1055 +#: ../git-debrebase:1018 #, perl-format msgid "unknown kind of merge from %s" msgstr "onbekend soort samenvoeging vanuit %s" -#: ../git-debrebase:1058 +#: ../git-debrebase:1021 msgid "octopus merge" msgstr "meervoudige samenvoeging (octopus merge)" -#: ../git-debrebase:1062 +#: ../git-debrebase:1025 msgid "general two-parent merge" msgstr "algemene twee-oudersamenvoeging (two-parent merge)" -#: ../git-debrebase:1079 +#: ../git-debrebase:1042 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "strijdige ankers in samengevoegde golfbrekers (merged-breakwaters) %s" -#: ../git-debrebase:1119 +#: ../git-debrebase:1082 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s" -#: ../git-debrebase:1147 +#: ../git-debrebase:1110 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "wijziging (%s) bij het verpakken volgt de wijziging van de toeleveraar" -#: ../git-debrebase:1148 +#: ../git-debrebase:1111 #, perl-format msgid " (eg %s)" msgstr " (bijv. %s)" -#: ../git-debrebase:1154 +#: ../git-debrebase:1117 msgid "found mixed upstream/packaging commit" msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" -#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168 -#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187 +#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 +#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 #, perl-format msgid " (%s)" msgstr " (%s)" -#: ../git-debrebase:1162 +#: ../git-debrebase:1125 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "vastlegging in verband met uitwisselingsbeheer aangetroffen (%s)" -#: ../git-debrebase:1167 +#: ../git-debrebase:1130 msgid "found dgit dsc import" msgstr "dsc-import door dgit aangetroffen" -#: ../git-debrebase:1172 +#: ../git-debrebase:1135 msgid "found bare dgit dsc import with no prior history" msgstr "" "kale dsc-import door dgit aangetroffen zonder voorafgaande geschiedenis" -#: ../git-debrebase:1178 +#: ../git-debrebase:1141 msgid "found vanilla merge" msgstr "standaardsamenvoeging (vanilla merge) aangetroffen" -#: ../git-debrebase:1185 +#: ../git-debrebase:1148 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s" -#: ../git-debrebase:1253 +#: ../git-debrebase:1216 #, 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:1254 +#: ../git-debrebase:1217 #, 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:1375 +#: ../git-debrebase:1338 msgid "bare dgit dsc import" msgstr "kale dsc-import door dgit" -#: ../git-debrebase:1715 ../git-debrebase:1718 +#: ../git-debrebase:1678 ../git-debrebase:1681 #, perl-format msgid "mismatch %s ?" msgstr "discrepantie %s ?" -#: ../git-debrebase:1721 +#: ../git-debrebase:1684 #, perl-format msgid "mismatch %s != %s ?" msgstr "discrepantie %s != %s ?" -#: ../git-debrebase:1731 +#: ../git-debrebase:1694 #, perl-format msgid "internal error %#x %s %s" msgstr "interne fout %#x %s %s" -#: ../git-debrebase:1759 +#: ../git-debrebase:1722 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "%s: gewassen (laundered) (head was %s)\n" -#: ../git-debrebase:1773 +#: ../git-debrebase:1736 msgid "you are in the middle of a git-rebase already" msgstr "u bent reeds middenin een git-rebase" -#: ../git-debrebase:1799 +#: ../git-debrebase:1762 msgid "launder for rebase" msgstr "wassen (launder) voor rebase" -#: ../git-debrebase:1804 +#: ../git-debrebase:1767 msgid "analyse does not support any options" msgstr "analyse ondersteunt geen opties" -#: ../git-debrebase:1806 +#: ../git-debrebase:1769 msgid "too many arguments to analyse" msgstr "te veel argumenten om te analyseren" -#: ../git-debrebase:1841 +#: ../git-debrebase:1802 +#, perl-format +msgid "%s already exists" +msgstr "%s bestaat reeds" + +#: ../git-debrebase:1804 msgid "HEAD symref is not to refs/heads/" msgstr "HEAD symref wijst niet naar refs/heads/" -#: ../git-debrebase:1864 +#: ../git-debrebase:1827 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "Oké, u bent voor op %s\n" -#: ../git-debrebase:1868 +#: ../git-debrebase:1831 #, perl-format msgid "you are behind %s, divergence risk" msgstr "u bent achter op %s, gevaar voor uiteenlopen" -#: ../git-debrebase:1872 +#: ../git-debrebase:1835 #, perl-format msgid "you have diverged from %s" msgstr "u bent uiteengelopen van %s" -#: ../git-debrebase:1894 +#: ../git-debrebase:1857 msgid "remote dgit branch" msgstr "externe dgit-tak" -#: ../git-debrebase:1897 +#: ../git-debrebase:1860 msgid "remote dgit branch for sid" msgstr "externe dgit-tak voor sid" -#: ../git-debrebase:1925 +#: ../git-debrebase:1888 msgid "Recorded previous head for preservation" msgstr "Vorige head voor behoud opgetekend" -#: ../git-debrebase:1933 +#: ../git-debrebase:1896 #, perl-format msgid "could not record ffq-prev: %s" msgstr "kon ffq-prev niet optekenen: %s" -#: ../git-debrebase:1944 +#: ../git-debrebase:1907 #, perl-format msgid "could not check ffq-prev: %s" msgstr "kon ffq-prev niet controleren: %s" -#: ../git-debrebase:1964 +#: ../git-debrebase:1927 msgid "fast forward" msgstr "lineair (fast forward)" -#: ../git-debrebase:1974 +#: ../git-debrebase:1937 msgid "Declare fast forward / record previous work" msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" -#: ../git-debrebase:1986 +#: ../git-debrebase:1949 msgid "No ffq-prev to stitch." msgstr "Geen ffq-prev om te borduren." -#: ../git-debrebase:2017 -#, perl-format -msgid "" -"Could not determine appropriate upstream commitish.\n" -" (Tried these tags: %s)\n" -" Check version, and specify upstream commitish explicitly." -msgstr "" -"Kon geen passende toeleveraar-commitish bepalen.\n" -" (Probeerde deze tags: %s)\n" -" Controleer versie en geef toeleveraar-commitish expliciet op." - -#: ../git-debrebase:2036 +#: ../git-debrebase:1966 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" -#: ../git-debrebase:2041 +#: ../git-debrebase:1971 #, perl-format msgid "bad version number `%s'" msgstr "fout versienummer `%s'" -#: ../git-debrebase:2059 +#: ../git-debrebase:1989 #, perl-format msgid "upstream piece `%s'" msgstr "toeleveraarsstuk `%s'" -#: ../git-debrebase:2060 +#: ../git-debrebase:1990 msgid "upstream (main piece" msgstr "van de toeleveraar (belangrijkste stuk" -#: ../git-debrebase:2080 +#: ../git-debrebase:2010 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" -#: ../git-debrebase:2098 +#: ../git-debrebase:2028 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:2114 +#: ../git-debrebase:2044 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " @@ -2754,14 +2340,14 @@ msgstr "" "(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " "stuk plus misschien een eerdere combinatie)" -#: ../git-debrebase:2123 +#: ../git-debrebase:2053 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" "eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet " "`.'" -#: ../git-debrebase:2136 +#: ../git-debrebase:2066 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " @@ -2770,118 +2356,118 @@ msgstr "" "vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-" "combine'-vastlegging" -#: ../git-debrebase:2147 +#: ../git-debrebase:2077 #, perl-format msgid "introducing upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt ingevoerd" -#: ../git-debrebase:2150 +#: ../git-debrebase:2080 #, perl-format msgid "dropping upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt weggelaten" -#: ../git-debrebase:2153 +#: ../git-debrebase:2083 #, perl-format msgid "not fast forward: %s %s" msgstr "niet lineair (fast forward): %s %s" -#: ../git-debrebase:2264 +#: ../git-debrebase:2194 msgid "Previous head already recorded\n" msgstr "Vorige head reeds opgenomen\n" -#: ../git-debrebase:2268 +#: ../git-debrebase:2198 #, perl-format msgid "Could not preserve: %s" msgstr "Niet in staat te behouden: %s" -#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 -#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 -#: ../git-debrebase:2472 +#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 +#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 +#: ../git-debrebase:2402 msgid "no arguments allowed" msgstr "geen argumenten toegelaten" -#: ../git-debrebase:2307 +#: ../git-debrebase:2237 msgid "branch contains furniture (not laundered)" msgstr "tak bevat stoffering (niet gewassen)" -#: ../git-debrebase:2308 +#: ../git-debrebase:2238 msgid "branch is unlaundered" msgstr "tak is ongewassen (unlaundered)" -#: ../git-debrebase:2309 +#: ../git-debrebase:2239 msgid "branch needs laundering" msgstr "tak heeft wasbeurt nodig" -#: ../git-debrebase:2310 +#: ../git-debrebase:2240 msgid "branch not in git-debrebase form" msgstr "tak is niet in git-debrebase-indeling" -#: ../git-debrebase:2320 +#: ../git-debrebase:2250 msgid "current branch contents, in git-debrebase terms:\n" msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2322 +#: ../git-debrebase:2252 msgid " branch is laundered\n" msgstr " tak is gewassen\n" -#: ../git-debrebase:2338 +#: ../git-debrebase:2268 #, perl-format msgid " %s is not well-defined\n" msgstr " %s is niet goed gedefinieerd\n" -#: ../git-debrebase:2344 +#: ../git-debrebase:2274 msgid "key git-debrebase commits:\n" msgstr "kern-git-debrebase-vastleggingen:\n" -#: ../git-debrebase:2345 +#: ../git-debrebase:2275 msgid "anchor" msgstr "anker" -#: ../git-debrebase:2346 +#: ../git-debrebase:2276 msgid "breakwater" msgstr "golfbreker (breakwater)" -#: ../git-debrebase:2351 +#: ../git-debrebase:2281 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2358 +#: ../git-debrebase:2288 msgid " unstitched; previous tip was:\n" msgstr " borduursel losgemaakt; vorige tip was:\n" -#: ../git-debrebase:2361 +#: ../git-debrebase:2291 msgid " stitched? (no record of git-debrebase work)\n" msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" -#: ../git-debrebase:2363 +#: ../git-debrebase:2293 msgid " stitched\n" msgstr " geborduurd\n" -#: ../git-debrebase:2365 +#: ../git-debrebase:2295 msgid " not git-debrebase (diverged since last stitch)\n" msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" -#: ../git-debrebase:2368 +#: ../git-debrebase:2298 msgid "you are currently rebasing\n" msgstr "u bent momenteel aan het rebasen\n" -#: ../git-debrebase:2385 ../git-debrebase:2398 +#: ../git-debrebase:2315 ../git-debrebase:2328 msgid "launder for git-debrebase quick" msgstr "wassen voor git-debrebase quick" -#: ../git-debrebase:2392 ../git-debrebase:2422 +#: ../git-debrebase:2322 ../git-debrebase:2352 msgid "No ongoing git-debrebase session." msgstr "Geen lopende git-debrebase-sessie." -#: ../git-debrebase:2461 +#: ../git-debrebase:2391 msgid "Commit patch queue (exported by git-debrebase)" msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" -#: ../git-debrebase:2478 +#: ../git-debrebase:2408 msgid "No (more) patches to export." msgstr "Geen (andere) patches die geëxporteerd moeten worden." -#: ../git-debrebase:2485 +#: ../git-debrebase:2415 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " @@ -2890,39 +2476,39 @@ msgstr "" "De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " "gestaakt). Probeer eerst een wasbeurt te doen." -#: ../git-debrebase:2505 +#: ../git-debrebase:2435 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "%s bevat commentaar die verwijderd zal worden" -#: ../git-debrebase:2510 +#: ../git-debrebase:2440 #, perl-format msgid "patch %s repeated in %s !" msgstr "patch %s herhaald in %s !" -#: ../git-debrebase:2517 +#: ../git-debrebase:2447 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" -#: ../git-debrebase:2525 +#: ../git-debrebase:2455 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2530 +#: ../git-debrebase:2460 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:2546 +#: ../git-debrebase:2476 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2551 +#: ../git-debrebase:2481 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2567 +#: ../git-debrebase:2497 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2934,12 +2520,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2575 +#: ../git-debrebase:2505 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2582 +#: ../git-debrebase:2512 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2949,47 +2535,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2584 +#: ../git-debrebase:2514 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2591 +#: ../git-debrebase:2521 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2609 +#: ../git-debrebase:2539 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:2615 +#: ../git-debrebase:2545 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2618 +#: ../git-debrebase:2548 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2621 +#: ../git-debrebase:2551 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2623 +#: ../git-debrebase:2553 #, 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:2625 +#: ../git-debrebase:2555 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2632 +#: ../git-debrebase:2562 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -3000,14 +2586,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:2678 +#: ../git-debrebase:2608 #, 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:2707 +#: ../git-debrebase:2637 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -3018,17 +2604,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2728 +#: ../git-debrebase:2658 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2736 +#: ../git-debrebase:2666 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2750 +#: ../git-debrebase:2680 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -3039,58 +2625,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:2754 +#: ../git-debrebase:2684 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2766 +#: ../git-debrebase:2696 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:2773 +#: ../git-debrebase:2703 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2779 +#: ../git-debrebase:2709 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2788 +#: ../git-debrebase:2718 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2794 +#: ../git-debrebase:2724 #, 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:2825 +#: ../git-debrebase:2755 #, 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:2834 +#: ../git-debrebase:2764 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2871 +#: ../git-debrebase:2801 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2880 +#: ../git-debrebase:2810 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2894 +#: ../git-debrebase:2824 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -3101,99 +2687,99 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2900 +#: ../git-debrebase:2830 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2907 +#: ../git-debrebase:2837 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2911 +#: ../git-debrebase:2841 #, 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:3013 +#: ../git-debrebase:2943 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:3023 +#: ../git-debrebase:2953 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:3053 +#: ../git-debrebase:2983 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" -#: ../Debian/Dgit.pm:295 +#: ../Debian/Dgit.pm:293 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:315 +#: ../Debian/Dgit.pm:319 #, perl-format msgid "getcwd failed: %s\n" msgstr "getcwd mislukte: %s\n" -#: ../Debian/Dgit.pm:334 +#: ../Debian/Dgit.pm:338 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:336 +#: ../Debian/Dgit.pm:340 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:339 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:347 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:349 +#: ../Debian/Dgit.pm:353 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:355 +#: ../Debian/Dgit.pm:359 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:357 +#: ../Debian/Dgit.pm:361 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:363 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:450 +#: ../Debian/Dgit.pm:454 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:460 +#: ../Debian/Dgit.pm:464 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:479 +#: ../Debian/Dgit.pm:483 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:485 +#: ../Debian/Dgit.pm:489 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:506 +#: ../Debian/Dgit.pm:510 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -3201,33 +2787,55 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:513 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:617 +#: ../Debian/Dgit.pm:621 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:618 +#: ../Debian/Dgit.pm:622 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:689 +#: ../Debian/Dgit.pm:644 +#, fuzzy +#| msgid "found mixed upstream/packaging commit" +msgid "using specified upstream commitish" +msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" + +#: ../Debian/Dgit.pm:650 +#, perl-format +msgid "" +"Could not determine appropriate upstream commitish.\n" +" (Tried these tags: %s)\n" +" Check version, and specify upstream commitish explicitly." +msgstr "" +"Kon geen passende toeleveraar-commitish bepalen.\n" +" (Probeerde deze tags: %s)\n" +" Controleer versie en geef toeleveraar-commitish expliciet op." + +#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#, perl-format +msgid "using upstream from git tag %s" +msgstr "" + +#: ../Debian/Dgit.pm:764 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:690 +#: ../Debian/Dgit.pm:765 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:706 +#: ../Debian/Dgit.pm:781 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:715 +#: ../Debian/Dgit.pm:790 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -3236,44 +2844,417 @@ 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:729 +#: ../Debian/Dgit.pm:804 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:750 +#: ../Debian/Dgit.pm:825 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:911 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:843 +#: ../Debian/Dgit.pm:932 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:1000 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:934 +#: ../Debian/Dgit.pm:1023 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:942 +#: ../Debian/Dgit.pm:1031 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:951 +#: ../Debian/Dgit.pm:1040 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" +#~ msgid "Import %s" +#~ msgstr "Importeren van %s" + +#~ msgid "Record %s (%s) in archive suite %s\n" +#~ msgstr "Gegeven %s (%s) uit archiefsuite %s\n" + +#~ msgid "Not updating %s from %s to %s.\n" +#~ msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" + +#~ msgid "%s: NO git hash" +#~ msgstr "%s: GEEN hash van git" + +#~ msgid "%s: specified git info (%s)" +#~ msgstr "%s: git info werd opgegeven (%s)" + +#~ msgid "%s: specified git hash" +#~ msgstr "%s: git hash werd opgegeven" + +#~ msgid "%s: invalid Dgit info" +#~ msgstr "%s: ongeldige Dgit info" + +#~ msgid "%s release %s for %s (%s) [dgit]\n" +#~ msgstr "%s release %s voor %s (%s) [dgit]\n" + +#~ msgid "" +#~ "%s release %s for %s (%s)\n" +#~ "(maintainer view tag generated by dgit --quilt=%s)\n" +#~ msgstr "" +#~ "%s release %s voor %s (%s)\n" +#~ "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" + +#~ msgid "" +#~ "Push failed, while checking state of the archive.\n" +#~ "You can retry the push, after fixing the problem, if you like.\n" +#~ msgstr "" +#~ "Push mislukte tijdens het nagaan van de toestand van het archief.\n" +#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " +#~ "probleem.\n" + +#~ msgid "" +#~ "package appears to be new in this suite; if this is intentional, use --new" +#~ msgstr "" +#~ "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling " +#~ "is, gebruik dan --new" + +#~ msgid "" +#~ "Push failed, while preparing your push.\n" +#~ "You can retry the push, after fixing the problem, if you like.\n" +#~ msgstr "" +#~ "Push mislukte tijdens het voorbereiden van uw push.\n" +#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " +#~ "probleem.\n" + +#~ msgid "looked for .dsc %s, but %s; maybe you forgot to build" +#~ msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen" + +#~ msgid "" +#~ "Branch is managed by git-debrebase (%s\n" +#~ "exists), but quilt mode (%s) implies a split view.\n" +#~ "Pass the right --quilt option or adjust your git config.\n" +#~ "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" +#~ msgstr "" +#~ "Tak wordt beheerd door git-debrebase (%s\n" +#~ "bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n" +#~ "Gebruik de juiste --quilt-optie of pas uw git config aan.\n" +#~ "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" + +#~ msgid "" +#~ "--quilt=%s but no cached dgit view:\n" +#~ " perhaps HEAD changed since dgit build[-source] ?" +#~ msgstr "" +#~ "--quilt=%s maar geen gecachete dgit-weergave:\n" +#~ " werd HEAD misschien gewijzigd sinds dgit build[-source]?" + +#~ msgid "" +#~ "dgit push: HEAD is not a descendant of the archive's version.\n" +#~ "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" +#~ "To rewind history, if permitted by the archive, use --deliberately-not-" +#~ "fast-forward." +#~ msgstr "" +#~ "dgit push: HEAD is geen afstammeling van de versie van het archief.\n" +#~ "Om de inhoud van het archief te overschrijven, geeft u de opdracht --" +#~ "overwrite[=VERSIE].\n" +#~ "Om de geschiedenis terug te spoelen, als het archief dat toestaat, " +#~ "gebruikt u --deliberately-not-fast-forward." + +#~ msgid "checking that %s corresponds to HEAD" +#~ msgstr "bezig na te gaan dat %s overeenkomt met HEAD" + +#~ msgid "HEAD specifies a different tree to %s:\n" +#~ msgstr "HEAD geeft een andere boom op aan %s:\n" + +#~ msgid "" +#~ "There is a problem with your source tree (see dgit(7) for some hints).\n" +#~ "To see a full diff, run git diff %s %s\n" +#~ msgstr "" +#~ "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n" +#~ "Om alle verschillen te zien, gebruikt u git diff %s %s\n" + +#~ msgid "" +#~ "Perhaps you forgot to build. Or perhaps there is a problem with your\n" +#~ " source tree (see dgit(7) for some hints). To see a full diff, run\n" +#~ " git diff %s %s\n" +#~ msgstr "" +#~ "Misschien vergat u te bouwen (build). Of er is misschien een probleem " +#~ "met\n" +#~ " uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te " +#~ "zien,\n" +#~ " gebruikt u git diff %s %s\n" + +#~ msgid "" +#~ "failed to find unique changes file (looked for %s in %s); perhaps you " +#~ "need to use dgit -C" +#~ msgstr "" +#~ "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien " +#~ "moet u dgit -C gebruiken" + +#~ msgid "uploading binaries, although distro policy is source only" +#~ msgstr "" +#~ "bezig met uploaden van binaire pakketten, hoewel het beleid van de " +#~ "distributie uitsluitend broncode (source only) voorschrijft" + +#~ msgid "source-only upload, although distro policy requires .debs" +#~ msgstr "" +#~ "upload van uitsluitend broncode (source-only), hoewel het beleid van de " +#~ "distributie .deb's vereist" + +#~ msgid "" +#~ "source-only upload, even though package is entirely NEW\n" +#~ "(this is contrary to policy in %s)" +#~ msgstr "" +#~ "upload van uitsluitend broncode (source-only), hoewel pakket volledig " +#~ "NIEUW is\n" +#~ "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" + +#~ msgid "unknown source-only-uploads policy `%s'" +#~ msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" + +#~ msgid "" +#~ "Push failed, while signing the tag.\n" +#~ "You can retry the push, after fixing the problem, if you like.\n" +#~ msgstr "" +#~ "Push mislukte tijdens het ondertekenen van de tag.\n" +#~ "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van " +#~ "het probleem.\n" + +#~ msgid "" +#~ "Push failed, *after* signing the tag.\n" +#~ "If you want to try again, you should use a new version number.\n" +#~ msgstr "" +#~ "Push mislukte *na* het ondertekenen van de tag.\n" +#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " +#~ "gebruiken.\n" + +#~ msgid "" +#~ "Push failed, while updating the remote git repository - see messages " +#~ "above.\n" +#~ "If you want to try again, you should use a new version number.\n" +#~ msgstr "" +#~ "Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie " +#~ "de meldingen hierboven.\n" +#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " +#~ "gebruiken.\n" + +#~ msgid "" +#~ "Push failed, while obtaining signatures on the .changes and .dsc.\n" +#~ "If it was just that the signature failed, you may try again by using\n" +#~ "debsign by hand to sign the changes file (see the command dgit tried,\n" +#~ "above), and then dput that changes file to complete the upload.\n" +#~ "If you need to change the package, you must use a new version number.\n" +#~ msgstr "" +#~ "Push mislukte bij het verkrijgen van de ondertekening van .changes en ." +#~ "dsc.\n" +#~ "Indien het louter een mislukte ondertekening betreft, kunt u opnieuw " +#~ "proberen\n" +#~ "door handmatig het changes-bestand te ondertekenen met debsign (zie " +#~ "hierboven\n" +#~ "welk commando dgit gebruikte) en vervolgens het changes-bestand te " +#~ "uploaden\n" +#~ "met dput om zo de upload te vervolledigen.\n" +#~ "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " +#~ "gebruiken.\n" + +#~ msgid "pushed and uploaded %s" +#~ msgstr "%s gepusht en geüpload" + +#~ msgid "-p is not allowed with clone; specify as argument instead" +#~ msgstr "" +#~ "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op " +#~ "als argument" + +#~ msgid "incorrect arguments to dgit clone" +#~ msgstr "incorrecte argumenten voor dgit clone" + +#~ msgid "remove %s: %s\n" +#~ msgstr "verwijder %s: %s\n" + +#~ msgid "check whether to remove %s: %s\n" +#~ msgstr "controleer of %s moet verwijderd worden: %s\n" + +#~ msgid "incorrect arguments to dgit fetch or dgit pull" +#~ msgstr "incorrecte argumenten voor dgit fetch of dgit pull" + +#~ msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" +#~ msgstr "" +#~ "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet " +#~ "ondersteund\n" + +#~ msgid "dgit checkout needs a suite argument" +#~ msgstr "dgit checkout heeft een suite nodig als argument" + +#~ msgid "setting up vcs-git: %s\n" +#~ msgstr "bezig met opzetten van vcs-git: %s\n" + +#~ msgid "vcs git already configured: %s\n" +#~ msgstr "vcs git is reeds geconfigureerd: %s\n" + +#~ msgid "changing vcs-git url to: %s\n" +#~ msgstr "url van vcs-git wordt veranderd naar: %s\n" + +#~ msgid "fetching (%s)\n" +#~ msgstr "bezig met ophalen (%s)\n" + +#~ msgid "incorrect arguments to dgit %s" +#~ msgstr "incorrecte argumenten voor dgit %s" + +#~ msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +#~ msgstr "" +#~ "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel " +#~ "wordt %s opgegeven" + +#~ msgid "" +#~ "build host has dgit rpush protocol versions %s but invocation host has %s" +#~ msgstr "" +#~ "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die " +#~ "van de aanroepende computer zijn %s" + +#~ msgid "create %s: %s" +#~ msgstr "maak %s aan: %s" + +#~ msgid "build host child failed: %s" +#~ msgstr "dochterproces op de bouwcomputer faalde: %s" + +#~ msgid "all done\n" +#~ msgstr "alles klaar\n" + +#~ msgid "file %s (%s) twice" +#~ msgstr "bestand %s (%s) tweemaal" + +#~ msgid "bad param spec" +#~ msgstr "slechte parameter-spec" + +#~ msgid "bad previously spec" +#~ msgstr "slechte vroegere spec" + +#~ msgid "" +#~ "rpush negotiated protocol version %s which does not support quilt mode %s" +#~ msgstr "" +#~ "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-" +#~ "modus %s niet ondersteunt" + +#~ msgid "buildinfo mismatch in field %s" +#~ msgstr "buildinfo-incongruentie in veld %s" + +#~ msgid "buildinfo contains forbidden field %s" +#~ msgstr "buildinfo bevat ongeoorloofd veld %s" + +#~ msgid "remote changes file" +#~ msgstr "extern changes-bestand" + +#~ msgid "not a plain file or symlink\n" +#~ msgstr "geen echt bestand of symbolische koppeling\n" + +#~ msgid "mode or type changed\n" +#~ msgstr "modus of type gewijzigd\n" + +#~ msgid "modified symlink\n" +#~ msgstr "symbolische koppeling gewijzigd\n" + +#~ msgid "deletion of symlink\n" +#~ msgstr "verwijdering van symbolische koppeling\n" + +#~ msgid "creation with non-default mode\n" +#~ msgstr "creatie met een niet-standaard modus\n" + +#~ msgid "dgit view: changes are required..." +#~ msgstr "dgit-weergave: er zijn wijzigingen vereist..." + +#~ msgid "" +#~ "\n" +#~ "For full diff showing the problem(s), type:\n" +#~ " %s\n" +#~ msgstr "" +#~ "\n" +#~ "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" +#~ " %s\n" + +#~ msgid "" +#~ "--quilt=%s specified, implying patches-unapplied git tree\n" +#~ " but git tree differs from orig in upstream files." +#~ msgstr "" +#~ "--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n" +#~ " (een git-boom zonder dat de patches toegepast worden)\n" +#~ " maar de git-boom verschilt van orig in de toeleveraarsbestanden." + +#~ msgid "" +#~ "\n" +#~ " ... debian/patches is missing; perhaps this is a patch queue branch?" +#~ msgstr "" +#~ "\n" +#~ " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" +#~ "wachtrij?" + +#~ msgid "" +#~ "--quilt=%s specified, implying patches-applied git tree\n" +#~ " but git tree differs from result of applying debian/patches to upstream\n" +#~ msgstr "" +#~ "--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n" +#~ " (een git-boom met toegepaste patches)\n" +#~ " maar de git-boom verschilt van het resultaat van het toepassen van\n" +#~ " debian/patches op de broncode van de toeleveraar.\n" + +#~ msgid "dgit view: creating patches-applied version using gbp pq" +#~ msgstr "" +#~ "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" + +#~ msgid "" +#~ "--quilt=%s specified, implying that HEAD is for use with a\n" +#~ " tool which does not create patches for changes to upstream\n" +#~ " .gitignores: but, such patches exist in debian/patches.\n" +#~ msgstr "" +#~ "--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om " +#~ "gebruikt\n" +#~ " te worden met een hulpmiddel dat geen patches maakt om .gitignores van " +#~ "de\n" +#~ " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke " +#~ "patches.\n" + +#~ msgid "dgit view: creating patch to represent .gitignore changes" +#~ msgstr "" +#~ "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore " +#~ "te representeren" + +#~ msgid "" +#~ "%s already exists; but want to create it to record .gitignore changes" +#~ msgstr "" +#~ "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore " +#~ "op te tekenen" + +#~ msgid "" +#~ "Subject: Update .gitignore from Debian packaging branch\n" +#~ "\n" +#~ "The Debian packaging git branch contains these updates to the upstream\n" +#~ ".gitignore file(s). This patch is autogenerated, to provide these\n" +#~ "updates to users of the official Debian archive view of the package.\n" +#~ msgstr "" +#~ "Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n" +#~ "\n" +#~ "De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n" +#~ ".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n" +#~ "gegenereerd om deze updates ter beschikking te stellen van gebruikers " +#~ "van\n" +#~ "de weergave van het pakket uit het officiële Debian-archief.\n" + +#~ msgid "Commit patch to update .gitignore\n" +#~ msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" + +#~ msgid "-p is not allowed with dgit %s" +#~ msgstr "-p is niet toegestaan met dgit %s" + +#~ msgid "unknown clean-mode `%s'" +#~ msgstr "onbekende clean-modus `%s'" + #~ msgid "import %s requires .../%s, but it does not exist" #~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 71969f4a..3c253481 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../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:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../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 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,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 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -66,9 +68,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:326 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361 +#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:352 msgid "When upstream tags releases in git" msgstr "" @@ -106,8 +108,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 #, no-wrap msgid "" " % git deborig\n" @@ -127,14 +129,51 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 -#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:334 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137 +msgid "Using untagged upstream commits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141 +msgid "" +"Sometimes upstream does not tag their releases, or you want to package an " +"unreleased git snapshot. In such a case you can create your own upstream " +"release tag, of the form BI, where I is the upstream " +"version you plan to put in I. The B prefix " +"ensures that your tag will not clash with any tags upstream later creates." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148 +msgid "" +"For example, suppose that the latest upstream release is 1.2.2 and you want " +"to package git commit ab34c21 which was made on 2013-12-11. A common " +"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 " +"and so you could use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159 +msgid "to obtain a release tag, and then proceed as above." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373 +#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:364 msgid "When upstream releases only tarballs" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 #, no-wrap msgid "" " % mkdir foo\n" @@ -144,12 +183,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 msgid "Now create I:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 #, no-wrap msgid "" " [DEFAULT]\n" @@ -160,7 +199,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 #, no-wrap msgid "" " sign-tags = True\n" @@ -170,7 +209,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 #, no-wrap msgid "" " [import-orig]\n" @@ -179,12 +218,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -196,12 +235,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 #, no-wrap msgid "" " % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -209,7 +248,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 msgid "" "Our upstream branch cannot be pushed to B, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -217,7 +256,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -226,19 +265,19 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -246,24 +285,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294 +#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 msgid "" "To achieve this, you might need to delete I. " "One way to have dgit check your progress is to run B." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441 +#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324 +#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330 +#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" " % git remote update\n" @@ -271,7 +310,15 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +msgid "" +"If you want to package an untagged upstream commit (because upstream does " +"not tag releases or because you want to package an upstream development " +"snapshot), see \"Using untagged upstream commits\" above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 msgid "" "You will need the I from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -280,12 +327,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341 +#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345 +#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -293,12 +340,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349 +#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:353 +#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -306,7 +353,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -314,12 +361,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472 +#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546 +#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 msgid "" "The easiest way to handle this is to add a B field to " "I, and a B setting in I. " @@ -328,19 +375,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:551 +#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:582 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:751 +#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 +#: ../git-debpush.1.pod:228 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753 +#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 msgid "" "This tutorial was written and is maintained by Sean Whitton " ". It contains contributions from other dgit " @@ -348,7 +396,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324 msgid "GIT CONFIGURATION" msgstr "" @@ -481,14 +529,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:165 msgid "" "Because we want to work in git, we need a virtual upstream branch with " "virtual release tags. gbp-import-orig(1) can manage this for us. To begin" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:200 +#: ../dgit-maint-debrebase.7.pod:226 msgid "" "You are now ready to proceed as above, making commits to the I " "directory and to the upstream source. As above, for technical reasons, B, we start with that. If you don't already " @@ -507,7 +555,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:219 +#: ../dgit-maint-debrebase.7.pod:245 #, no-wrap msgid "" " % git clone salsa.debian.org:Debian/foo\n" @@ -518,14 +566,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:226 +#: ../dgit-maint-debrebase.7.pod:252 msgid "" "If you don't have any existing git history, or you have history only on the " "special B server, we start with B:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:231 +#: ../dgit-maint-debrebase.7.pod:257 #, no-wrap msgid "" " % dgit clone foo\n" @@ -534,12 +582,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:236 +#: ../dgit-maint-debrebase.7.pod:262 msgid "Then we make new upstream tags available:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:244 +#: ../dgit-maint-debrebase.7.pod:270 msgid "" "We now use a B command to convert your " "existing history to the git-debrebase(5) data model. Which command you " @@ -547,17 +595,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:250 +#: ../dgit-maint-debrebase.7.pod:276 msgid "(A) There is no delta queue." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:252 +#: ../dgit-maint-debrebase.7.pod:278 msgid "If there do not exist any Debian patches, use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294 #, no-wrap msgid "" " % git debrebase convert-from-gbp\n" @@ -565,12 +613,12 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:260 +#: ../dgit-maint-debrebase.7.pod:286 msgid "(B) There is a delta queue, and patches are unapplied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:262 +#: ../dgit-maint-debrebase.7.pod:288 msgid "" "This is the standard git-buildpackage(1) workflow: there are Debian patches, " "but the upstream source is committed to git without those patches applied. " @@ -578,7 +626,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:272 +#: ../dgit-maint-debrebase.7.pod:298 msgid "" "If you were not previously using dgit to upload your package (i.e. you were " "not using the workflow described in dgit-maint-gbp(7)), and you happen to " @@ -587,17 +635,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:277 +#: ../dgit-maint-debrebase.7.pod:303 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:279 +#: ../dgit-maint-debrebase.7.pod:305 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:283 +#: ../dgit-maint-debrebase.7.pod:309 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -605,7 +653,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-debrebase.7.pod:315 msgid "" "Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it " "is exactly what you would get if you deleted .git, invoked B to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -621,7 +669,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:307 +#: ../dgit-maint-debrebase.7.pod:333 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -629,14 +677,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:311 +#: ../dgit-maint-debrebase.7.pod:337 msgid "" "Now when you pull work from other Debian contributors, git will rebase your " "work on top of theirs." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:314 +#: ../dgit-maint-debrebase.7.pod:340 msgid "" "If you use this clone for upstream development in addition to Debian " "packaging work, you may not want to set this global setting. Instead, see " @@ -645,24 +693,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-debrebase.7.pod:345 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-debrebase.7.pod:347 msgid "" "There are two steps: obtaining git refs that correspond to the new release, " "and importing that release using git-debrebase(1)." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:357 +#: ../dgit-maint-debrebase.7.pod:387 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:361 +#: ../dgit-maint-debrebase.7.pod:391 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -670,7 +718,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:365 +#: ../dgit-maint-debrebase.7.pod:395 msgid "" "This invocation of git-debrebase(1) involves a git rebase. You may need to " "resolve conflicts if the Debian delta queue does not apply cleanly to the " @@ -678,13 +726,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:369 +#: ../dgit-maint-debrebase.7.pod:399 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:374 +#: ../dgit-maint-debrebase.7.pod:404 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -692,35 +740,36 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:378 +#: ../dgit-maint-debrebase.7.pod:408 msgid "" -"Pass I<--stat> just to see the list of changed files, which is useful to " -"determine whether there are any new or deleted files that may need " -"accounting for in your copyright file." +"Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the " +"list of added or removed files, which is useful to determine whether there " +"are any new or deleted files that may need accounting for in your copyright " +"file." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:392 +#: ../dgit-maint-debrebase.7.pod:423 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:394 +#: ../dgit-maint-debrebase.7.pod:425 msgid "Just make commits on master that change the contents of I." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:396 +#: ../dgit-maint-debrebase.7.pod:427 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:398 +#: ../dgit-maint-debrebase.7.pod:429 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:400 +#: ../dgit-maint-debrebase.7.pod:431 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I directory. You can also use tools like git-" @@ -728,19 +777,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:404 +#: ../dgit-maint-debrebase.7.pod:435 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:406 +#: ../dgit-maint-debrebase.7.pod:437 msgid "" "git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, " "re-order and delete patches. Run" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714 +#: ../dgit-maint-debrebase.7.pod:442 ../dgit-maint-debrebase.7.pod:745 #, no-wrap msgid "" " % git debrebase -i\n" @@ -748,19 +797,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:415 +#: ../dgit-maint-debrebase.7.pod:446 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:418 +#: ../dgit-maint-debrebase.7.pod:449 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:420 +#: ../dgit-maint-debrebase.7.pod:451 msgid "" "After completing the git rebase, your branch will not be a fast-forward of " "the git HEAD you had before the rebase. This means that we cannot push the " @@ -769,14 +818,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:426 +#: ../dgit-maint-debrebase.7.pod:457 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:431 +#: ../dgit-maint-debrebase.7.pod:462 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -784,7 +833,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:466 msgid "" "Note that each time you conclude a debrebase you introduce a pseudomerge " "into your git history, which may make it harder to read. Try to do all of " @@ -794,7 +843,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:443 +#: ../dgit-maint-debrebase.7.pod:474 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B, B or B or B. Remember to pass I<--new> " "if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:450 +#: ../dgit-maint-debrebase.7.pod:481 msgid "" "In some cases where you used B since the " "last upload, it is not possible for dgit to make your history fast-" @@ -819,7 +868,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:456 +#: ../dgit-maint-debrebase.7.pod:487 msgid "" "Right before uploading, if you did not just already do so, you might want to " "have git-debrebase(1) shuffle your branch such that the Debian delta queue " @@ -827,7 +876,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:462 +#: ../dgit-maint-debrebase.7.pod:493 #, no-wrap msgid "" " % git debrebase\n" @@ -836,24 +885,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:467 +#: ../dgit-maint-debrebase.7.pod:498 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:469 +#: ../dgit-maint-debrebase.7.pod:500 msgid "" "After dgit pushing, be sure to git push to B, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:474 +#: ../dgit-maint-debrebase.7.pod:505 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-debrebase.7.pod:507 msgid "" "Here we explain how to handle material that is merely DFSG-non-free. " "Material which is legally dangerous (for example, files which are actually " @@ -861,7 +910,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:480 +#: ../dgit-maint-debrebase.7.pod:511 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -873,12 +922,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:486 +#: ../dgit-maint-debrebase.7.pod:517 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:488 +#: ../dgit-maint-debrebase.7.pod:519 msgid "" "Our approach is to maintain a DFSG-clean upstream branch, and create tags on " "this branch for each release that we want to import. We then import those " @@ -887,12 +936,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:494 +#: ../dgit-maint-debrebase.7.pod:525 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:498 +#: ../dgit-maint-debrebase.7.pod:529 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -904,14 +953,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:506 +#: ../dgit-maint-debrebase.7.pod:537 msgid "" "Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or " "in the case of a new package," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:511 +#: ../dgit-maint-debrebase.7.pod:542 #, no-wrap msgid "" " % git branch --unset-upstream\n" @@ -920,18 +969,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:516 +#: ../dgit-maint-debrebase.7.pod:547 msgid "and proceed with \"INITIAL DEBIANISATION\"." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:518 +#: ../dgit-maint-debrebase.7.pod:549 msgid "" "For subsequent releases (whether or not they require additional filtering):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:523 +#: ../dgit-maint-debrebase.7.pod:554 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -945,7 +994,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:533 +#: ../dgit-maint-debrebase.7.pod:564 msgid "" "Our upstream-dfsg branch cannot be pushed to B, but since we " "will need it whenever we import a new upstream version, we must push it " @@ -954,7 +1003,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:540 +#: ../dgit-maint-debrebase.7.pod:571 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -962,17 +1011,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:544 +#: ../dgit-maint-debrebase.7.pod:575 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:584 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:557 +#: ../dgit-maint-debrebase.7.pod:588 #, no-wrap msgid "" " % dgit fetch\n" @@ -981,7 +1030,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:562 +#: ../dgit-maint-debrebase.7.pod:593 msgid "" "If that fails, because your branch and the NMUers' work represent divergent " "branches of development, you have a number of options. Here we describe the " @@ -989,7 +1038,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:566 +#: ../dgit-maint-debrebase.7.pod:597 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I. Changes there would either cause trouble, or be " @@ -997,12 +1046,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:570 +#: ../dgit-maint-debrebase.7.pod:601 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:574 +#: ../dgit-maint-debrebase.7.pod:605 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -1010,14 +1059,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:578 +#: ../dgit-maint-debrebase.7.pod:609 msgid "" "If the NMUer added new commits modifying the upstream source, you will " "probably want to debrebase before your next upload to tidy those up." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-debrebase.7.pod:612 msgid "" "For example, the NMUer might have used git-revert(1) to unapply one of your " "patches. A debrebase can be used to strip both the patch and the reversion " @@ -1025,12 +1074,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:585 +#: ../dgit-maint-debrebase.7.pod:616 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:587 +#: ../dgit-maint-debrebase.7.pod:618 msgid "" "If you cannot rebase because you have already pushed to B, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " @@ -1038,24 +1087,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:592 +#: ../dgit-maint-debrebase.7.pod:623 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:594 +#: ../dgit-maint-debrebase.7.pod:625 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:596 +#: ../dgit-maint-debrebase.7.pod:627 msgid "" "Above we noted that each time you conclude a debrebase, you introduce a " "pseudomerge into your git history, which may make it harder to read." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:599 +#: ../dgit-maint-debrebase.7.pod:630 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B only right before you upload or push to B is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1088,7 +1137,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:618 +#: ../dgit-maint-debrebase.7.pod:649 msgid "" "I will often be out-of-date because git-debrebase(1) will " "only regenerate it when it needs to. So you should not rely on the " @@ -1098,17 +1147,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:624 +#: ../dgit-maint-debrebase.7.pod:655 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:626 +#: ../dgit-maint-debrebase.7.pod:657 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:628 +#: ../dgit-maint-debrebase.7.pod:659 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1117,7 +1166,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:634 +#: ../dgit-maint-debrebase.7.pod:665 msgid "" "The idea here is that from Debian's point of view, upstream releases are " "immutable points in history. We want to make sure that we are basing our " @@ -1126,19 +1175,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:640 +#: ../dgit-maint-debrebase.7.pod:671 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:643 +#: ../dgit-maint-debrebase.7.pod:674 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:645 +#: ../dgit-maint-debrebase.7.pod:676 msgid "" "If this is the first ever dgit push of the package, consider passing I<--" "deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " @@ -1148,12 +1197,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:651 +#: ../dgit-maint-debrebase.7.pod:682 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:653 +#: ../dgit-maint-debrebase.7.pod:684 msgid "" "The git history made by git-debrebase can seem complicated. Here are some " "suggestions for helpful invocations of gitk and git. They can be adapted " @@ -1161,12 +1210,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:657 +#: ../dgit-maint-debrebase.7.pod:688 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:661 +#: ../dgit-maint-debrebase.7.pod:692 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1174,17 +1223,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:694 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:667 +#: ../dgit-maint-debrebase.7.pod:698 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:700 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1192,12 +1241,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:671 +#: ../dgit-maint-debrebase.7.pod:702 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:673 +#: ../dgit-maint-debrebase.7.pod:704 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1205,12 +1254,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:706 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:679 +#: ../dgit-maint-debrebase.7.pod:710 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1218,7 +1267,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:681 +#: ../dgit-maint-debrebase.7.pod:712 msgid "" "The \"Declare fast forward\" commits you see have an older history (usually, " "an older delta queue) as one parent, and a newer history as the other. --" @@ -1226,12 +1275,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:688 +#: ../dgit-maint-debrebase.7.pod:719 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:692 +#: ../dgit-maint-debrebase.7.pod:723 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1239,17 +1288,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:694 +#: ../dgit-maint-debrebase.7.pod:725 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:698 +#: ../dgit-maint-debrebase.7.pod:729 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:700 +#: ../dgit-maint-debrebase.7.pod:731 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1258,12 +1307,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:703 +#: ../dgit-maint-debrebase.7.pod:734 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:705 +#: ../dgit-maint-debrebase.7.pod:736 #, no-wrap msgid "" " % git debrebase status\n" @@ -1271,24 +1320,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:707 +#: ../dgit-maint-debrebase.7.pod:738 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:709 +#: ../dgit-maint-debrebase.7.pod:740 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:718 +#: ../dgit-maint-debrebase.7.pod:749 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:722 +#: ../dgit-maint-debrebase.7.pod:753 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1296,7 +1345,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:727 +#: ../dgit-maint-debrebase.7.pod:758 msgid "" "A third alternative is to have git-debrebase(1) shuffle all the Debian " "changes to the end of your branch, and then manipulate them yourself using " @@ -1304,7 +1353,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:733 +#: ../dgit-maint-debrebase.7.pod:764 #, no-wrap msgid "" " % git debrebase\n" @@ -1313,7 +1362,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:738 +#: ../dgit-maint-debrebase.7.pod:769 msgid "" "If you take this approach, you should be very careful not to start the " "rebase too early, including before the most recent pseudomerge. git-rebase " @@ -1323,6 +1372,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:749 +#: ../dgit-maint-debrebase.7.pod:780 msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" msgstr "" diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index 1dbb6826..129dca5e 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,36 +21,38 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../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:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 -#: ../git-debrebase.5.pod:678 +#: ../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 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -59,18 +61,18 @@ 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 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" #. type: textblock #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138 msgid "dgit(1), dgit(7)" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:514 #, no-wrap msgid "" " % dgit pull\n" @@ -147,9 +149,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361 +#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:352 msgid "When upstream tags releases in git" msgstr "" @@ -216,8 +218,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 #, no-wrap msgid "" " % git deborig\n" @@ -261,21 +263,58 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 -#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:329 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137 +msgid "Using untagged upstream commits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141 +msgid "" +"Sometimes upstream does not tag their releases, or you want to package an " +"unreleased git snapshot. In such a case you can create your own upstream " +"release tag, of the form BI, where I is the upstream " +"version you plan to put in I. The B prefix " +"ensures that your tag will not clash with any tags upstream later creates." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148 +msgid "" +"For example, suppose that the latest upstream release is 1.2.2 and you want " +"to package git commit ab34c21 which was made on 2013-12-11. A common " +"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 " +"and so you could use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159 +msgid "to obtain a release tag, and then proceed as above." +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373 +#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:364 msgid "When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:125 +#: ../dgit-maint-merge.7.pod:151 msgid "" "We need a virtual upstream branch with virtual release tags. gbp-import-" "orig(1) can manage this for us. To begin" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 #, no-wrap msgid "" " % mkdir foo\n" @@ -285,12 +324,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 msgid "Now create I:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 #, no-wrap msgid "" " [DEFAULT]\n" @@ -301,7 +340,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 #, no-wrap msgid "" " sign-tags = True\n" @@ -311,7 +350,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 #, no-wrap msgid "" " [import-orig]\n" @@ -320,12 +359,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -337,12 +376,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 #, no-wrap msgid "" " % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -350,7 +389,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 msgid "" "Our upstream branch cannot be pushed to B, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -358,7 +397,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -367,31 +406,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:185 +#: ../dgit-maint-merge.7.pod:211 msgid "" "You are now ready to proceed as above, making commits to both the upstream " "source and the I directory." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:219 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:223 #, no-wrap msgid "" " % dgit clone foo\n" @@ -401,19 +440,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:203 +#: ../dgit-maint-merge.7.pod:229 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:205 +#: ../dgit-maint-merge.7.pod:231 msgid "" "First, if you don't already have the git history locally, clone it, and " "obtain the corresponding orig.tar from the archive:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:210 +#: ../dgit-maint-merge.7.pod:236 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -423,12 +462,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 +#: ../dgit-maint-merge.7.pod:242 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:220 +#: ../dgit-maint-merge.7.pod:246 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -437,12 +476,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:225 +#: ../dgit-maint-merge.7.pod:251 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -450,12 +489,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:233 +#: ../dgit-maint-merge.7.pod:259 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:235 +#: ../dgit-maint-merge.7.pod:261 msgid "" "Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., " "it is exactly what you would get if you ran B. " "One way to have dgit check your progress is to run B." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:246 +#: ../dgit-maint-merge.7.pod:272 msgid "" "The first dgit push will require I<--overwrite>. If this is the first ever " "dgit push of the package, consider passing I<--deliberately-not-fast-" @@ -486,24 +525,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:253 +#: ../dgit-maint-merge.7.pod:279 msgid "SOURCE PACKAGE CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:255 +#: ../dgit-maint-merge.7.pod:281 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:257 +#: ../dgit-maint-merge.7.pod:283 msgid "" "We set some source package options such that dgit can transparently handle " "the \"dropping\" and \"refreshing\" of changes to the upstream source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:263 +#: ../dgit-maint-merge.7.pod:289 #, no-wrap msgid "" " single-debian-patch\n" @@ -512,26 +551,26 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 +#: ../dgit-maint-merge.7.pod:294 msgid "" "You don't need to create this file if you are using the version 1.0 source " "package format." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:271 +#: ../dgit-maint-merge.7.pod:297 msgid "Sample text for debian/source/patch-header" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:273 +#: ../dgit-maint-merge.7.pod:299 msgid "" "It is a good idea to explain how a user can obtain a breakdown of the " "changes to the upstream source:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:278 +#: ../dgit-maint-merge.7.pod:304 msgid "" "The Debian packaging of foo is maintained in git, using the merging workflow " "described in dgit-maint-merge(7). There isn't a patch queue that can be " @@ -539,7 +578,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:282 +#: ../dgit-maint-merge.7.pod:308 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -548,7 +587,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:290 +#: ../dgit-maint-merge.7.pod:316 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -558,18 +597,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:296 +#: ../dgit-maint-merge.7.pod:322 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:299 +#: ../dgit-maint-merge.7.pod:325 msgid "A single combined diff, containing all the changes, follows." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:303 +#: ../dgit-maint-merge.7.pod:329 msgid "" "If you are using the version 1.0 source package format, this text should be " "added to README.source instead. The version 1.0 source package format " @@ -577,7 +616,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:307 +#: ../dgit-maint-merge.7.pod:333 msgid "" "If you're using the version 3.0 (quilt) source package format, you could add " "this text to README.source instead of debian/source/patch-header, but this " @@ -585,12 +624,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:314 +#: ../dgit-maint-merge.7.pod:340 msgid "" "Use B, B, B, B, " "B, and B as detailed in dgit(1). If any " @@ -600,7 +639,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:320 +#: ../dgit-maint-merge.7.pod:346 msgid "" "As an alternative to B and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " @@ -611,7 +650,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:327 +#: ../dgit-maint-merge.7.pod:353 msgid "" "If you want to skip dgit's checks while iterating on a problem with the " "package build (for example, you don't want to commit your changes to git), " @@ -619,17 +658,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:331 +#: ../dgit-maint-merge.7.pod:357 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 #, no-wrap msgid "" " % git remote update\n" @@ -637,7 +676,15 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +msgid "" +"If you want to package an untagged upstream commit (because upstream does " +"not tag releases or because you want to package an upstream development " +"snapshot), see \"Using untagged upstream commits\" above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 msgid "" "You will need the I from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -646,12 +693,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -659,12 +706,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -672,12 +719,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:366 +#: ../dgit-maint-merge.7.pod:396 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:368 +#: ../dgit-maint-merge.7.pod:398 msgid "" "It's a good idea to preview the merge of the new upstream release. First, " "just check for any new or deleted files that may need accounting for in your " @@ -685,20 +732,20 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:404 #, no-wrap msgid "" -" % git diff --stat master..1.2.3 -- . ':!debian'\n" +" % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:378 +#: ../dgit-maint-merge.7.pod:408 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:382 +#: ../dgit-maint-merge.7.pod:412 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -706,12 +753,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:386 +#: ../dgit-maint-merge.7.pod:416 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:390 +#: ../dgit-maint-merge.7.pod:420 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -721,7 +768,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -729,17 +776,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:410 +#: ../dgit-maint-merge.7.pod:440 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:414 +#: ../dgit-maint-merge.7.pod:444 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -752,7 +799,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:453 msgid "" "Before merging the new 1.2.3+dfsg tag to master, you should first determine " "whether it would be legally dangerous for the non-free material to be " @@ -760,7 +807,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:428 +#: ../dgit-maint-merge.7.pod:458 msgid "" "If it would be dangerous, there is a big problem; in this case please " "consult your archive administrators (for Debian this is the dgit " @@ -769,7 +816,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 msgid "" "The easiest way to handle this is to add a B field to " "I, and a B setting in I. " @@ -778,40 +825,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:440 +#: ../dgit-maint-merge.7.pod:470 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:442 +#: ../dgit-maint-merge.7.pod:472 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:448 +#: ../dgit-maint-merge.7.pod:478 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 +#: ../dgit-maint-merge.7.pod:482 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:457 +#: ../dgit-maint-merge.7.pod:487 msgid "" "Push the branch somewhere and ask upstream to merge it, or use git-format-" "patch(1) or git-request-pull(1)." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:462 +#: ../dgit-maint-merge.7.pod:492 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:466 +#: ../dgit-maint-merge.7.pod:496 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -825,7 +872,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:476 +#: ../dgit-maint-merge.7.pod:506 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -833,26 +880,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:582 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:488 +#: ../dgit-maint-merge.7.pod:518 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " "will then require I<--overwrite>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 +#: ../git-debpush.1.pod:228 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 msgid "" "This tutorial was written and is maintained by Sean Whitton " ". It contains contributions from other dgit " diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 6a149f69..2e5c3898 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-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,8 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" @@ -43,8 +44,8 @@ msgstr "" msgid "dgit - git integration with the Debian archive" msgstr "" -#. type: SH -#: ../dgit.1:6 +#. type: =head1 +#: ../dgit.1:6 ../git-debpush.1.pod:5 #, no-wrap msgid "SYNOPSIS" msgstr "" @@ -89,8 +90,8 @@ msgstr "" msgid "B [I] I ..." msgstr "" -#. type: SH -#: ../dgit.1:33 +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -417,7 +418,7 @@ msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1192 +#: ../dgit.1:185 ../dgit.1:1269 msgid "Print a usage summary." msgstr "" @@ -594,7 +595,7 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 #, no-wrap msgid "1." msgstr "" @@ -606,7 +607,7 @@ msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 #, no-wrap msgid "2." msgstr "" @@ -618,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 #, no-wrap msgid "3." msgstr "" @@ -1228,25 +1229,36 @@ msgid "" "won't make broken pushes.)" msgstr "" +#. type: Plain text +#: ../dgit.1:657 +msgid "" +"Note that this does B prevent dgit from cleaning your tree, so if the " +"changes in your working tree are in the form of untracked files, those might " +"still be deleted, especially with --clean=git. If you want to include " +"untracked files in the build, you can use --clean=none or --clean=dpkg-" +"source[-d] in addition to --include-dirty. Note that this combination can " +"fail if the untracked files are under I." +msgstr "" + #. type: TP -#: ../dgit.1:645 +#: ../dgit.1:657 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:648 +#: ../dgit.1:660 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:648 +#: ../dgit.1:660 #, no-wrap msgid "B<--overwrite>[=I]" msgstr "" #. type: Plain text -#: ../dgit.1:659 +#: ../dgit.1:671 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:670 +#: ../dgit.1:682 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1270,14 +1282,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:676 +#: ../dgit.1:688 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See BI<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:690 +#: ../dgit.1:702 msgid "" "If I is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1288,7 +1300,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:696 +#: ../dgit.1:708 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1297,26 +1309,26 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:701 +#: ../dgit.1:713 msgid "" -"(In quilt mode B, B or B, implying a split between the " -"dgit view and the maintainer view, the pseudo-merge will appear only in the " -"dgit view.)" +"(In quilt mode B, B, B or B*, implying a " +"split between the dgit view and the maintainer view, the pseudo-merge will " +"appear only in the dgit view.)" msgstr "" #. type: TP -#: ../dgit.1:701 +#: ../dgit.1:713 #, no-wrap msgid "B<--delayed>=I" msgstr "" #. type: Plain text -#: ../dgit.1:704 +#: ../dgit.1:716 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:714 +#: ../dgit.1:726 msgid "" "B If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1326,27 +1338,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:731 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:719 +#: ../dgit.1:731 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:725 +#: ../dgit.1:737 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:735 +#: ../dgit.1:747 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1355,7 +1367,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:743 +#: ../dgit.1:755 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1364,48 +1376,48 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:743 +#: ../dgit.1:755 #, no-wrap msgid "B<--save-dgit-view=>I|I" msgstr "" #. type: Plain text -#: ../dgit.1:753 +#: ../dgit.1:765 msgid "" -"Specifies that when a split view quilt mode is in operation, and dgit " -"calculates (or looks up in its cache) a dgit view corresponding to your " -"HEAD, the dgit view will be left in I. The specified ref is " -"unconditionally overwritten, so don't specify a branch you want to keep." +"Specifies that when split view is in operation, and dgit calculates (or " +"looks up in its cache) a dgit view corresponding to your HEAD, the dgit " +"view will be left in I. The specified ref is unconditionally " +"overwritten, so don't specify a branch you want to keep." msgstr "" #. type: Plain text -#: ../dgit.1:760 +#: ../dgit.1:769 msgid "" "This option is effective only with the following operations: quilt-fixup; " -"push; all builds. And it is only effective with --[quilt=]gbp, --" -"[quilt=]dpm, --quilt=unpatched." +"push; all builds. And it is only effective when split view is actually in " +"operation." msgstr "" #. type: Plain text -#: ../dgit.1:764 +#: ../dgit.1:773 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:768 +#: ../dgit.1:777 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:768 +#: ../dgit.1:777 #, no-wrap msgid "B<--deliberately->I" msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:791 msgid "" "Declare that you are deliberately doing I. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1417,13 +1429,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:782 +#: ../dgit.1:791 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:797 msgid "" "Declare that you are deliberately rewinding history. When pushing to " "Debian, use this when you are making a renewed upload of an entirely new " @@ -1432,23 +1444,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:799 +#: ../dgit.1:808 msgid "" -"In split view quilt modes, this also prevents the construction by dgit of a " -"pseudomerge to make the dgit view fast forwarding. Normally only one of --" -"overwrite (which creates a suitable pseudomerge) and --deliberately-not-" -"fast-forward (which suppresses the pseudomerge and the fast forward checks) " -"should be needed; --overwrite is usually better." +"When split view is in operation, this also prevents the construction by dgit " +"of a pseudomerge to make the dgit view fast forwarding. Normally only one " +"of --overwrite (which creates a suitable pseudomerge) and --deliberately-" +"not-fast-forward (which suppresses the pseudomerge and the fast forward " +"checks) should be needed; --overwrite is usually better." msgstr "" #. type: TP -#: ../dgit.1:799 +#: ../dgit.1:808 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:808 +#: ../dgit.1:817 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1460,27 +1472,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:808 +#: ../dgit.1:817 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:813 +#: ../dgit.1:822 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " "server will do this automatically when necessary." msgstr "" -#. type: TP -#: ../dgit.1:813 +#. type: =item +#: ../dgit.1:822 ../git-debpush.1.pod:112 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:820 +#: ../dgit.1:829 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1488,36 +1500,36 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:825 +#: ../dgit.1:834 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: TP -#: ../dgit.1:825 +#. type: =item +#: ../dgit.1:834 ../git-debpush.1.pod:124 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:834 +#: ../dgit.1:843 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " -"linear patch stack (as with --quilt=auto) but if that doesn't seem " +"linear patch stack (as with --quilt=linear) but if that doesn't seem " "possible, try to generate a single squashed patch for all the changes made " "in git (as with --quilt=smash). This is not a good idea for an NMU in " "Debian." msgstr "" -#. type: TP -#: ../dgit.1:834 +#. type: =item +#: ../dgit.1:843 ../git-debpush.1.pod:118 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:848 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1525,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:845 +#: ../dgit.1:854 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1533,14 +1545,14 @@ msgid "" "remain true.)" msgstr "" -#. type: TP -#: ../dgit.1:845 +#. type: =item +#: ../dgit.1:854 ../git-debpush.1.pod:129 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:853 +#: ../dgit.1:862 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1549,13 +1561,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:853 +#: ../dgit.1:862 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:858 +#: ../dgit.1:867 msgid "" "Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " "If you use this option and the metadata did in fact need fixing up, dgit " @@ -1563,20 +1575,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:858 +#: ../dgit.1:867 #, no-wrap -msgid "B<-->[B]B | B<-->[B]B | B<--quilt=unapplied>" +msgid "B<-->[B]B | B<-->[B]B | B<--quilt=unapplied> | B<-->[B]B[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:865 +#: ../dgit.1:874 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:873 +#: ../dgit.1:878 +msgid "" +"These quilt modes are known as B. See --split-view, " +"below." +msgstr "" + +#. type: Plain text +#: ../dgit.1:886 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1585,7 +1604,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:881 +#: ../dgit.1:894 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1593,7 +1612,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:886 +#: ../dgit.1:899 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1601,20 +1620,44 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:904 +#: ../dgit.1:913 msgid "" -"With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " -"and build) will automatically generate a conversion of your git branch into " -"the right form. dgit push will push the dgit-compatible form (the B) to the dgit git server. The dgit view will be visible to you in the " -"dgit remote tracking branches, but your own branch will not be modified. " -"dgit push will create a tag BI for the maintainer view, " -"and the dgit tag BI for the dgit view. dgit quilt-" -"fixup will merely do some checks, and cache the maintainer view." +"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " +"that your HEAD contains only a debian/ directory, with any changes to " +"upstream files represented as patches in debian/patches. The upstream " +"source must be available in git, by default, in a suitably named git tag; " +"see --upstream-commitish. In this mode, dgit cannot check that all edited " +"upstream files are properly represented as patches: dgit relies on debian/" +"patches being correct." msgstr "" #. type: Plain text -#: ../dgit.1:913 +#: ../dgit.1:924 +msgid "" +"B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " +"there is no appropriate upstream git history. To construct the dgit view, " +"dgit will import your orig tarballs' contents into git. In this mode, dgit " +"cannot check that the upstream parts of your upload correspond to what you " +"intend: dgit relies on the right orig tarball(s) existing, and debian/" +"patches being correct." +msgstr "" + +#. type: Plain text +#: ../dgit.1:942 +msgid "" +"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " +"quilt-fixup and build) will automatically generate a conversion of your git " +"branch into the right form. dgit push will push the dgit-compatible form " +"(the B) to the dgit git server. The dgit view will be visible " +"to you in the dgit remote tracking branches, but your own branch will not be " +"modified. dgit push will create a tag BI for the " +"maintainer view, and the dgit tag BI for the dgit " +"view. dgit quilt-fixup will merely do some checks, and cache the maintainer " +"view." +msgstr "" + +#. type: Plain text +#: ../dgit.1:951 msgid "" "B This is because it is not always possible to tell: a " @@ -1626,13 +1669,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:913 +#: ../dgit.1:951 #, no-wrap msgid "B<-d>I | B<--distro=>I" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:960 msgid "" "Specifies that the suite to be operated on is part of distro I. " "This overrides the default value found from the git config option B|B|B" +msgstr "" + +#. type: Plain text +#: ../dgit.1:976 +msgid "" +"Controls whether dgit operates a split view, separating your own branch (as " +"Debian maintainer) from that shown to users of dgit clone and dgit fetch." +msgstr "" + +#. type: Plain text +#: ../dgit.1:984 +msgid "" +"When split view is in operation dgit will not make or merge any commits onto " +"your own branch. Specifically, only the dgit view will contain dgit's " +"pseudomerges, which bring into the git history previous uploads made with " +"dgit push, and any commits in debian/patches required to make a correct `3.0 " +"(quilt)' source package." +msgstr "" + +#. type: Plain text +#: ../dgit.1:990 +msgid "" +"B is the default, and splits the view only when needed: i.e., when you " +"are working with a `3.0 (quilt)' source package and a splitting quilt mode: " +"--[quilt=]gbp, dpm, unpatched or baredebian*." +msgstr "" + +#. type: Plain text +#: ../dgit.1:993 +msgid "" +"B splits the view regardless of the source format and the quilt mode." +msgstr "" + +#. type: Plain text +#: ../dgit.1:996 +msgid "B will cause dgit to fail if split view is needed." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1004 +msgid "" +"When split view is in operation, the dgit view is visible in your local git " +"clone, but only in refs specific to dgit: notably BI and BIBI." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1007 +msgid "" +"Note that split view does not affect dgit fetch, and is not compatible with " +"dgit pull." +msgstr "" + +#. type: TP +#: ../dgit.1:1007 #, no-wrap msgid "B<-C>I" msgstr "" #. type: Plain text -#: ../dgit.1:938 +#: ../dgit.1:1012 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1673,7 +1773,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:947 +#: ../dgit.1:1021 msgid "" "If the specified I pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1681,13 +1781,28 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:947 +#: ../dgit.1:1021 +#, no-wrap +msgid "B<--upstream-commitish=>I" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1029 +msgid "" +"For use with --quilt=baredebian only. Specifies the commit containing the " +"upstream source. This commit must be identical to your .orig tarball. The " +"default is to look for one of the git tags IB< v>IB< upstream/>I " +"(in that order), where U is the upstream version." +msgstr "" + +#. type: TP +#: ../dgit.1:1029 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:959 +#: ../dgit.1:1041 msgid "" "When doing a build, delete any changes files matching " "IB<_>IB<_*.changes> before starting. This ensures that " @@ -1699,32 +1814,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:962 +#: ../dgit.1:1044 msgid "" "Note that B will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:962 +#: ../dgit.1:1044 #, no-wrap msgid "B<--build-products-dir=>I" msgstr "" #. type: Plain text -#: ../dgit.1:966 +#: ../dgit.1:1048 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1051 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:1060 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B" msgstr "" #. type: Plain text -#: ../dgit.1:981 +#: ../dgit.1:1063 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:981 +#: ../dgit.1:1063 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:988 +#: ../dgit.1:1070 msgid "" "Generates a DEP-14 tag (eg BI) as well as a dgit tag (eg " -"BI) where possible. This is the default." +"BI). This is the default." msgstr "" #. type: TP -#: ../dgit.1:988 +#: ../dgit.1:1070 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:994 -msgid "" -"Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " -"where only the old tag format is supported, the dgit tag will have the " -"DEP-14 name. This option does not prevent that.)" +#: ../dgit.1:1073 +msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:994 +#: ../dgit.1:1073 #, no-wrap -msgid "B<--dep14tag-always>" +msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:999 -msgid "" -"Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " -"not support that, dgit push will fail." +#: ../dgit.1:1076 +msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:999 +#: ../dgit.1:1076 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1003 +#: ../dgit.1:1080 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1003 +#: ../dgit.1:1080 #, no-wrap msgid "B<-c>IB<=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1007 +#: ../dgit.1:1084 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1007 +#: ../dgit.1:1084 #, no-wrap msgid "B<-v>I|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1093 msgid "" "Specifies the B<-v>I option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1826,7 +1936,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1022 +#: ../dgit.1:1099 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1834,30 +1944,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1022 +#: ../dgit.1:1099 #, no-wrap msgid "B<-m>I" msgstr "" #. type: Plain text -#: ../dgit.1:1025 +#: ../dgit.1:1102 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1025 +#: ../dgit.1:1102 #, no-wrap msgid "B<--ch:>I