diff options
-rw-r--r-- | po/en_US.po | 660 | ||||
-rw-r--r-- | po/messages.pot | 660 | ||||
-rw-r--r-- | po/nl.po | 662 | ||||
-rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 453 | ||||
-rw-r--r-- | po4a/dgit-maint-merge_7.pot | 222 | ||||
-rw-r--r-- | po4a/dgit_1.pot | 503 | ||||
-rw-r--r-- | po4a/git-debrebase_1.pot | 256 |
7 files changed, 1718 insertions, 1698 deletions
diff --git a/po/en_US.po b/po/en_US.po index cd157b5..2436a5d 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-09-06 22:47+0000\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:267 +#: ../dgit:268 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:274 +#: ../dgit:275 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:282 +#: ../dgit:283 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:287 +#: ../dgit:288 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:519 +#: ../dgit:520 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:524 ../dgit:530 +#: ../dgit:525 ../dgit:531 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:525 +#: ../dgit:526 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:533 +#: ../dgit:534 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:540 +#: ../dgit:541 msgid "protocol message" msgstr "" -#: ../dgit:548 +#: ../dgit:549 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:569 +#: ../dgit:570 msgid "bad byte count" msgstr "" -#: ../dgit:572 +#: ../dgit:573 msgid "data block" msgstr "" -#: ../dgit:651 +#: ../dgit:652 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:653 +#: ../dgit:654 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:678 +#: ../dgit:679 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:697 +#: ../dgit:698 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:701 +#: ../dgit:702 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:706 +#: ../dgit:707 msgid "too few arguments" msgstr "" -#: ../dgit:822 +#: ../dgit:823 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:825 +#: ../dgit:826 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:845 +#: ../dgit:846 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:902 +#: ../dgit:903 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:917 +#: ../dgit:918 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:933 +#: ../dgit:934 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:953 +#: ../dgit:954 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:971 +#: ../dgit:972 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "" -#: ../dgit:978 +#: ../dgit:979 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:982 +#: ../dgit:983 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1005 +#: ../dgit:1006 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1168 +#: ../dgit:1169 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1236 +#: ../dgit:1237 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1243 +#: ../dgit:1244 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1264 +#: ../dgit:1265 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1282 +#: ../dgit:1283 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1286 +#: ../dgit:1287 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1288 +#: ../dgit:1289 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1290 +#: ../dgit:1291 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1292 ../dgit:1317 +#: ../dgit:1293 ../dgit:1318 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1306 +#: ../dgit:1307 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1308 +#: ../dgit:1309 msgid "bad component" msgstr "" -#: ../dgit:1311 +#: ../dgit:1312 msgid "bad filename" msgstr "" -#: ../dgit:1313 +#: ../dgit:1314 msgid "bad sha256sum" msgstr "" -#: ../dgit:1364 +#: ../dgit:1365 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1448 +#: ../dgit:1449 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1472 +#: ../dgit:1473 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1498 +#: ../dgit:1499 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1499 +#: ../dgit:1500 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1604 +#: ../dgit:1605 #, 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:1743 +#: ../dgit:1744 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1746 +#: ../dgit:1747 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1748 +#: ../dgit:1749 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1768 +#: ../dgit:1769 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1774 +#: ../dgit:1775 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1801 +#: ../dgit:1802 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1824 +#: ../dgit:1825 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1839 +#: ../dgit:1840 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1876 +#: ../dgit:1877 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1922 +#: ../dgit:1923 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1933 +#: ../dgit:1934 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1979 +#: ../dgit:1980 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1988 +#: ../dgit:1989 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1992 +#: ../dgit:1993 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1998 +#: ../dgit:1999 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2038 +#: ../dgit:2039 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2051 +#: ../dgit:2052 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2064 +#: ../dgit:2065 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2080 +#: ../dgit:2081 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2085 +#: ../dgit:2086 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2093 +#: ../dgit:2094 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2128 +#: ../dgit:2129 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2136 +#: ../dgit:2137 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2139 +#: ../dgit:2140 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2158 +#: ../dgit:2159 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2181 +#: ../dgit:2182 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2193 +#: ../dgit:2194 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2224 +#: ../dgit:2225 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2226 +#: ../dgit:2227 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2228 +#: ../dgit:2229 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2262 +#: ../dgit:2263 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2264 +#: ../dgit:2265 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2267 +#: ../dgit:2268 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2276 +#: ../dgit:2277 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2280 +#: ../dgit:2281 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2283 +#: ../dgit:2284 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2289 +#: ../dgit:2290 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2360 +#: ../dgit:2361 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2422 +#: ../dgit:2423 msgid "package changelog" msgstr "" -#: ../dgit:2462 +#: ../dgit:2463 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2531 ../dgit:2536 +#: ../dgit:2532 ../dgit:2537 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2551 ../dgit:2558 +#: ../dgit:2552 ../dgit:2559 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2584 ../dgit:6070 +#: ../dgit:2585 ../dgit:6078 msgid "source package" msgstr "" -#: ../dgit:2662 +#: ../dgit:2665 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2681 +#: ../dgit:2684 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2690 +#: ../dgit:2693 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2705 +#: ../dgit:2713 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2709 +#: ../dgit:2717 msgid "Import of source package" msgstr "" -#: ../dgit:2729 +#: ../dgit:2737 #, perl-format msgid "" "\n" @@ -547,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2771 +#: ../dgit:2779 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2775 +#: ../dgit:2783 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2779 +#: ../dgit:2787 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2795 +#: ../dgit:2803 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2890 +#: ../dgit:2898 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2905 +#: ../dgit:2913 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2949 +#: ../dgit:2957 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2964 +#: ../dgit:2972 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:2969 +#: ../dgit:2977 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3116 +#: ../dgit:3124 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3121 +#: ../dgit:3129 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3126 +#: ../dgit:3134 #, 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:3136 +#: ../dgit:3144 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3156 +#: ../dgit:3164 msgid "rewrite map" msgstr "" -#: ../dgit:3163 +#: ../dgit:3171 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3167 +#: ../dgit:3175 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3169 +#: ../dgit:3177 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3176 +#: ../dgit:3184 msgid "additional commits" msgstr "" -#: ../dgit:3179 +#: ../dgit:3187 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3204 +#: ../dgit:3212 msgid "last upload to archive" msgstr "" -#: ../dgit:3208 +#: ../dgit:3216 msgid "no version available from the archive" msgstr "" -#: ../dgit:3291 +#: ../dgit:3299 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3298 +#: ../dgit:3306 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3303 +#: ../dgit:3311 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3331 +#: ../dgit:3339 #, perl-format msgid "" "\n" @@ -684,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3344 +#: ../dgit:3352 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3347 +#: ../dgit:3355 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3368 +#: ../dgit:3376 #, perl-format msgid "" "\n" @@ -700,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3377 +#: ../dgit:3385 #, perl-format msgid "" "\n" @@ -710,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3462 +#: ../dgit:3470 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3475 +#: ../dgit:3483 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3493 +#: ../dgit:3501 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3495 +#: ../dgit:3503 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3506 +#: ../dgit:3514 #, perl-format msgid "" "\n" @@ -740,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3521 +#: ../dgit:3529 msgid "fetched source tree" msgstr "" -#: ../dgit:3557 +#: ../dgit:3565 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3622 +#: ../dgit:3630 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3636 +#: ../dgit:3644 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3651 +#: ../dgit:3659 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3678 +#: ../dgit:3686 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3700 +#: ../dgit:3708 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3708 +#: ../dgit:3716 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3747 +#: ../dgit:3755 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3779 +#: ../dgit:3787 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3781 +#: ../dgit:3789 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3820 +#: ../dgit:3828 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3834 +#: ../dgit:3842 msgid "" "\n" "Key\n" @@ -811,257 +811,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3849 +#: ../dgit:3857 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3867 +#: ../dgit:3875 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3885 +#: ../dgit:3893 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3900 +#: ../dgit:3908 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3912 +#: ../dgit:3920 msgid "fetching existing git history" msgstr "" -#: ../dgit:3915 +#: ../dgit:3923 msgid "starting new git history" msgstr "" -#: ../dgit:3940 +#: ../dgit:3948 #, 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:3945 +#: ../dgit:3953 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3957 +#: ../dgit:3965 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3959 +#: ../dgit:3967 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3967 +#: ../dgit:3975 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3978 +#: ../dgit:3986 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3997 +#: ../dgit:4005 #, 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:4014 +#: ../dgit:4022 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4017 +#: ../dgit:4025 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4021 +#: ../dgit:4029 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4065 +#: ../dgit:4073 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4070 +#: ../dgit:4078 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4080 +#: ../dgit:4088 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4086 +#: ../dgit:4094 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4112 +#: ../dgit:4120 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4115 +#: ../dgit:4123 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4123 +#: ../dgit:4131 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4132 +#: ../dgit:4140 msgid "version currently in archive" msgstr "" -#: ../dgit:4141 +#: ../dgit:4149 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4149 +#: ../dgit:4157 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4160 +#: ../dgit:4168 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4163 +#: ../dgit:4171 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4177 +#: ../dgit:4185 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4233 +#: ../dgit:4241 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4242 +#: ../dgit:4250 msgid "maintainer view tag" msgstr "" -#: ../dgit:4244 +#: ../dgit:4252 msgid "dgit view tag" msgstr "" -#: ../dgit:4245 +#: ../dgit:4253 msgid "current archive contents" msgstr "" -#: ../dgit:4258 +#: ../dgit:4266 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4268 +#: ../dgit:4276 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4269 +#: ../dgit:4277 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4273 +#: ../dgit:4281 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4286 +#: ../dgit:4294 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4294 +#: ../dgit:4302 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4306 +#: ../dgit:4314 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4328 +#: ../dgit:4336 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4382 +#: ../dgit:4390 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5642 +#: ../dgit:5650 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5660 +#: ../dgit:5668 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5669 +#: ../dgit:5677 msgid "root commit" msgstr "" -#: ../dgit:5675 +#: ../dgit:5683 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5687 +#: ../dgit:5695 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5706 +#: ../dgit:5714 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5713 +#: ../dgit:5721 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5725 +#: ../dgit:5733 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5728 +#: ../dgit:5736 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5740 +#: ../dgit:5748 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5747 +#: ../dgit:5755 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5781 +#: ../dgit:5789 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5782 +#: ../dgit:5790 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5783 +#: ../dgit:5791 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5784 +#: ../dgit:5792 msgid "is series file\n" msgstr "" -#: ../dgit:5785 +#: ../dgit:5793 msgid "too long\n" msgstr "" -#: ../dgit:5789 +#: ../dgit:5797 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5818 +#: ../dgit:5826 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5901 +#: ../dgit:5909 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5919 +#: ../dgit:5927 msgid "converted" msgstr "" -#: ../dgit:5920 +#: ../dgit:5928 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5974 +#: ../dgit:5982 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5984 +#: ../dgit:5992 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6094 +#: ../dgit:6102 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6126 +#: ../dgit:6134 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6131 +#: ../dgit:6139 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6166 +#: ../dgit:6174 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6280 +#: ../dgit:6288 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1154,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6294 +#: ../dgit:6302 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6328 +#: ../dgit:6336 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6341 +#: ../dgit:6349 msgid "tarball" msgstr "" -#: ../dgit:6359 +#: ../dgit:6367 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6375 +#: ../dgit:6383 msgid "tarballs" msgstr "" -#: ../dgit:6389 +#: ../dgit:6397 msgid "upstream" msgstr "" -#: ../dgit:6413 +#: ../dgit:6421 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6423 +#: ../dgit:6431 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6432 +#: ../dgit:6440 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6436 +#: ../dgit:6444 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6443 +#: ../dgit:6451 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6447 +#: ../dgit:6455 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6450 +#: ../dgit:6458 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6453 +#: ../dgit:6461 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6456 +#: ../dgit:6464 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6460 +#: ../dgit:6468 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6471 +#: ../dgit:6479 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6510 +#: ../dgit:6518 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,82 +1240,82 @@ msgid "" "\n" msgstr "" -#: ../dgit:6522 +#: ../dgit:6530 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6551 +#: ../dgit:6559 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:6563 +#: ../dgit:6571 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6566 +#: ../dgit:6574 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6569 +#: ../dgit:6577 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6582 +#: ../dgit:6590 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6599 +#: ../dgit:6607 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6613 +#: ../dgit:6621 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6632 +#: ../dgit:6640 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6642 +#: ../dgit:6650 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6651 +#: ../dgit:6659 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6655 +#: ../dgit:6663 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6690 +#: ../dgit:6698 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6692 +#: ../dgit:6700 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6710 +#: ../dgit:6718 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:6717 +#: ../dgit:6725 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1323,54 +1323,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:6743 +#: ../dgit:6751 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6749 +#: ../dgit:6757 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6752 +#: ../dgit:6760 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6795 +#: ../dgit:6803 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6833 +#: ../dgit:6841 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6840 +#: ../dgit:6848 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6847 +#: ../dgit:6855 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6851 +#: ../dgit:6859 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6856 +#: ../dgit:6864 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6859 +#: ../dgit:6867 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6872 +#: ../dgit:6880 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1378,136 +1378,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6890 +#: ../dgit:6898 msgid "build successful\n" msgstr "" -#: ../dgit:6898 +#: ../dgit:6906 #, 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:7009 +#: ../dgit:7017 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7046 +#: ../dgit:7054 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7066 +#: ../dgit:7074 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7079 +#: ../dgit:7087 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7083 +#: ../dgit:7091 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7090 +#: ../dgit:7098 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7096 +#: ../dgit:7104 msgid "source changes file" msgstr "" -#: ../dgit:7098 +#: ../dgit:7106 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7118 ../dgit:7120 +#: ../dgit:7126 ../dgit:7128 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7134 +#: ../dgit:7142 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:7147 +#: ../dgit:7155 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7151 +#: ../dgit:7159 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:7181 +#: ../dgit:7189 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7202 +#: ../dgit:7210 msgid "source tree" msgstr "" -#: ../dgit:7204 +#: ../dgit:7212 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7217 +#: ../dgit:7225 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7221 +#: ../dgit:7229 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7225 +#: ../dgit:7233 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7242 +#: ../dgit:7250 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7247 +#: ../dgit:7255 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7249 +#: ../dgit:7257 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7260 +#: ../dgit:7268 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7263 +#: ../dgit:7271 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7274 +#: ../dgit:7282 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7294 +#: ../dgit:7302 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1515,21 +1515,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7301 +#: ../dgit:7309 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7303 +#: ../dgit:7311 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7313 +#: ../dgit:7321 #, perl-format msgid "" "Branch %s already exists\n" @@ -1537,129 +1537,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7341 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7335 +#: ../dgit:7343 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7343 +#: ../dgit:7351 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7362 +#: ../dgit:7370 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7366 +#: ../dgit:7374 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7367 +#: ../dgit:7375 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7378 +#: ../dgit:7386 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7380 +#: ../dgit:7388 msgid "Import, merging." msgstr "" -#: ../dgit:7394 +#: ../dgit:7402 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7403 +#: ../dgit:7411 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7410 +#: ../dgit:7418 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7428 +#: ../dgit:7436 msgid "need destination argument" msgstr "" -#: ../dgit:7433 +#: ../dgit:7441 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7449 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7452 +#: ../dgit:7460 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7458 +#: ../dgit:7466 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7465 ../dgit:7471 +#: ../dgit:7473 ../dgit:7479 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7477 +#: ../dgit:7485 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7524 +#: ../dgit:7532 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7563 +#: ../dgit:7571 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7567 +#: ../dgit:7575 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7667 +#: ../dgit:7675 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7740 +#: ../dgit:7748 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7755 +#: ../dgit:7763 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7759 +#: ../dgit:7767 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7765 +#: ../dgit:7773 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1667,35 +1667,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7782 +#: ../dgit:7790 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7795 +#: ../dgit:7803 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7815 +#: ../dgit:7823 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7826 +#: ../dgit:7834 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7854 +#: ../dgit:7862 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7855 +#: ../dgit:7863 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7874 +#: ../dgit:7882 #, perl-format msgid "unknown operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 20337c8..f81c3ef 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-06 22:47+0000\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:267 +#: ../dgit:268 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:274 +#: ../dgit:275 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:282 +#: ../dgit:283 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:287 +#: ../dgit:288 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:519 +#: ../dgit:520 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:524 ../dgit:530 +#: ../dgit:525 ../dgit:531 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:525 +#: ../dgit:526 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:533 +#: ../dgit:534 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:540 +#: ../dgit:541 msgid "protocol message" msgstr "" -#: ../dgit:548 +#: ../dgit:549 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:569 +#: ../dgit:570 msgid "bad byte count" msgstr "" -#: ../dgit:572 +#: ../dgit:573 msgid "data block" msgstr "" -#: ../dgit:651 +#: ../dgit:652 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:653 +#: ../dgit:654 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:678 +#: ../dgit:679 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:697 +#: ../dgit:698 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:701 +#: ../dgit:702 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:706 +#: ../dgit:707 msgid "too few arguments" msgstr "" -#: ../dgit:822 +#: ../dgit:823 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:825 +#: ../dgit:826 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:845 +#: ../dgit:846 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:902 +#: ../dgit:903 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:917 +#: ../dgit:918 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:933 +#: ../dgit:934 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:953 +#: ../dgit:954 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:971 +#: ../dgit:972 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "" -#: ../dgit:978 +#: ../dgit:979 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:982 +#: ../dgit:983 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1005 +#: ../dgit:1006 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1168 +#: ../dgit:1169 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1236 +#: ../dgit:1237 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1243 +#: ../dgit:1244 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1264 +#: ../dgit:1265 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1282 +#: ../dgit:1283 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1286 +#: ../dgit:1287 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1288 +#: ../dgit:1289 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1290 +#: ../dgit:1291 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1292 ../dgit:1317 +#: ../dgit:1293 ../dgit:1318 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1306 +#: ../dgit:1307 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1308 +#: ../dgit:1309 msgid "bad component" msgstr "" -#: ../dgit:1311 +#: ../dgit:1312 msgid "bad filename" msgstr "" -#: ../dgit:1313 +#: ../dgit:1314 msgid "bad sha256sum" msgstr "" -#: ../dgit:1364 +#: ../dgit:1365 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1448 +#: ../dgit:1449 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1472 +#: ../dgit:1473 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1498 +#: ../dgit:1499 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1499 +#: ../dgit:1500 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1604 +#: ../dgit:1605 #, 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:1743 +#: ../dgit:1744 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1746 +#: ../dgit:1747 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1748 +#: ../dgit:1749 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1768 +#: ../dgit:1769 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1774 +#: ../dgit:1775 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1801 +#: ../dgit:1802 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1824 +#: ../dgit:1825 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1839 +#: ../dgit:1840 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1876 +#: ../dgit:1877 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1922 +#: ../dgit:1923 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1933 +#: ../dgit:1934 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1979 +#: ../dgit:1980 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1988 +#: ../dgit:1989 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1992 +#: ../dgit:1993 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1998 +#: ../dgit:1999 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2038 +#: ../dgit:2039 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2051 +#: ../dgit:2052 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2064 +#: ../dgit:2065 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2080 +#: ../dgit:2081 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2085 +#: ../dgit:2086 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2093 +#: ../dgit:2094 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2128 +#: ../dgit:2129 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2136 +#: ../dgit:2137 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2139 +#: ../dgit:2140 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2158 +#: ../dgit:2159 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2181 +#: ../dgit:2182 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2193 +#: ../dgit:2194 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2224 +#: ../dgit:2225 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2226 +#: ../dgit:2227 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2228 +#: ../dgit:2229 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2262 +#: ../dgit:2263 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2264 +#: ../dgit:2265 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2267 +#: ../dgit:2268 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2276 +#: ../dgit:2277 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2280 +#: ../dgit:2281 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2283 +#: ../dgit:2284 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2289 +#: ../dgit:2290 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2360 +#: ../dgit:2361 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2422 +#: ../dgit:2423 msgid "package changelog" msgstr "" -#: ../dgit:2462 +#: ../dgit:2463 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2531 ../dgit:2536 +#: ../dgit:2532 ../dgit:2537 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2551 ../dgit:2558 +#: ../dgit:2552 ../dgit:2559 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2584 ../dgit:6070 +#: ../dgit:2585 ../dgit:6078 msgid "source package" msgstr "" -#: ../dgit:2662 +#: ../dgit:2665 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2681 +#: ../dgit:2684 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2690 +#: ../dgit:2693 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2705 +#: ../dgit:2713 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2709 +#: ../dgit:2717 msgid "Import of source package" msgstr "" -#: ../dgit:2729 +#: ../dgit:2737 #, perl-format msgid "" "\n" @@ -547,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2771 +#: ../dgit:2779 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2775 +#: ../dgit:2783 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2779 +#: ../dgit:2787 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2795 +#: ../dgit:2803 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2890 +#: ../dgit:2898 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2905 +#: ../dgit:2913 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2949 +#: ../dgit:2957 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2964 +#: ../dgit:2972 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:2969 +#: ../dgit:2977 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3116 +#: ../dgit:3124 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3121 +#: ../dgit:3129 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3126 +#: ../dgit:3134 #, 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:3136 +#: ../dgit:3144 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3156 +#: ../dgit:3164 msgid "rewrite map" msgstr "" -#: ../dgit:3163 +#: ../dgit:3171 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3167 +#: ../dgit:3175 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3169 +#: ../dgit:3177 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3176 +#: ../dgit:3184 msgid "additional commits" msgstr "" -#: ../dgit:3179 +#: ../dgit:3187 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3204 +#: ../dgit:3212 msgid "last upload to archive" msgstr "" -#: ../dgit:3208 +#: ../dgit:3216 msgid "no version available from the archive" msgstr "" -#: ../dgit:3291 +#: ../dgit:3299 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3298 +#: ../dgit:3306 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3303 +#: ../dgit:3311 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3331 +#: ../dgit:3339 #, perl-format msgid "" "\n" @@ -684,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3344 +#: ../dgit:3352 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3347 +#: ../dgit:3355 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3368 +#: ../dgit:3376 #, perl-format msgid "" "\n" @@ -700,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3377 +#: ../dgit:3385 #, perl-format msgid "" "\n" @@ -710,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3462 +#: ../dgit:3470 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3475 +#: ../dgit:3483 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3493 +#: ../dgit:3501 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3495 +#: ../dgit:3503 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3506 +#: ../dgit:3514 #, perl-format msgid "" "\n" @@ -740,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3521 +#: ../dgit:3529 msgid "fetched source tree" msgstr "" -#: ../dgit:3557 +#: ../dgit:3565 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3622 +#: ../dgit:3630 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3636 +#: ../dgit:3644 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3651 +#: ../dgit:3659 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3678 +#: ../dgit:3686 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3700 +#: ../dgit:3708 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3708 +#: ../dgit:3716 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3747 +#: ../dgit:3755 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3779 +#: ../dgit:3787 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3781 +#: ../dgit:3789 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3820 +#: ../dgit:3828 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3834 +#: ../dgit:3842 msgid "" "\n" "Key\n" @@ -811,257 +811,257 @@ msgid "" "\n" msgstr "" -#: ../dgit:3849 +#: ../dgit:3857 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3867 +#: ../dgit:3875 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3885 +#: ../dgit:3893 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3900 +#: ../dgit:3908 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3912 +#: ../dgit:3920 msgid "fetching existing git history" msgstr "" -#: ../dgit:3915 +#: ../dgit:3923 msgid "starting new git history" msgstr "" -#: ../dgit:3940 +#: ../dgit:3948 #, 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:3945 +#: ../dgit:3953 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3957 +#: ../dgit:3965 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3959 +#: ../dgit:3967 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3967 +#: ../dgit:3975 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3978 +#: ../dgit:3986 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3997 +#: ../dgit:4005 #, 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:4014 +#: ../dgit:4022 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4017 +#: ../dgit:4025 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4021 +#: ../dgit:4029 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4065 +#: ../dgit:4073 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4070 +#: ../dgit:4078 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4080 +#: ../dgit:4088 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4086 +#: ../dgit:4094 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4112 +#: ../dgit:4120 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4115 +#: ../dgit:4123 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4123 +#: ../dgit:4131 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4132 +#: ../dgit:4140 msgid "version currently in archive" msgstr "" -#: ../dgit:4141 +#: ../dgit:4149 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4149 +#: ../dgit:4157 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4160 +#: ../dgit:4168 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4163 +#: ../dgit:4171 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4177 +#: ../dgit:4185 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4233 +#: ../dgit:4241 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4242 +#: ../dgit:4250 msgid "maintainer view tag" msgstr "" -#: ../dgit:4244 +#: ../dgit:4252 msgid "dgit view tag" msgstr "" -#: ../dgit:4245 +#: ../dgit:4253 msgid "current archive contents" msgstr "" -#: ../dgit:4258 +#: ../dgit:4266 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4268 +#: ../dgit:4276 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4269 +#: ../dgit:4277 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4273 +#: ../dgit:4281 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4286 +#: ../dgit:4294 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4294 +#: ../dgit:4302 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4306 +#: ../dgit:4314 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4328 +#: ../dgit:4336 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4382 +#: ../dgit:4390 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5642 +#: ../dgit:5650 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5660 +#: ../dgit:5668 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5669 +#: ../dgit:5677 msgid "root commit" msgstr "" -#: ../dgit:5675 +#: ../dgit:5683 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5687 +#: ../dgit:5695 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5706 +#: ../dgit:5714 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5713 +#: ../dgit:5721 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5725 +#: ../dgit:5733 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5728 +#: ../dgit:5736 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5740 +#: ../dgit:5748 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5747 +#: ../dgit:5755 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5781 +#: ../dgit:5789 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5782 +#: ../dgit:5790 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5783 +#: ../dgit:5791 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5784 +#: ../dgit:5792 msgid "is series file\n" msgstr "" -#: ../dgit:5785 +#: ../dgit:5793 msgid "too long\n" msgstr "" -#: ../dgit:5789 +#: ../dgit:5797 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5818 +#: ../dgit:5826 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5901 +#: ../dgit:5909 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5919 +#: ../dgit:5927 msgid "converted" msgstr "" -#: ../dgit:5920 +#: ../dgit:5928 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5974 +#: ../dgit:5982 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5984 +#: ../dgit:5992 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6094 +#: ../dgit:6102 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6126 +#: ../dgit:6134 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6131 +#: ../dgit:6139 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6166 +#: ../dgit:6174 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6280 +#: ../dgit:6288 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1154,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6294 +#: ../dgit:6302 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6328 +#: ../dgit:6336 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6341 +#: ../dgit:6349 msgid "tarball" msgstr "" -#: ../dgit:6359 +#: ../dgit:6367 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6375 +#: ../dgit:6383 msgid "tarballs" msgstr "" -#: ../dgit:6389 +#: ../dgit:6397 msgid "upstream" msgstr "" -#: ../dgit:6413 +#: ../dgit:6421 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6423 +#: ../dgit:6431 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6432 +#: ../dgit:6440 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6436 +#: ../dgit:6444 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6443 +#: ../dgit:6451 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6447 +#: ../dgit:6455 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6450 +#: ../dgit:6458 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6453 +#: ../dgit:6461 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6456 +#: ../dgit:6464 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6460 +#: ../dgit:6468 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6471 +#: ../dgit:6479 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6510 +#: ../dgit:6518 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,82 +1240,82 @@ msgid "" "\n" msgstr "" -#: ../dgit:6522 +#: ../dgit:6530 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6551 +#: ../dgit:6559 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:6563 +#: ../dgit:6571 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6566 +#: ../dgit:6574 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6569 +#: ../dgit:6577 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6582 +#: ../dgit:6590 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6599 +#: ../dgit:6607 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6613 +#: ../dgit:6621 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6632 +#: ../dgit:6640 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6642 +#: ../dgit:6650 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6651 +#: ../dgit:6659 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6655 +#: ../dgit:6663 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6690 +#: ../dgit:6698 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6692 +#: ../dgit:6700 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6710 +#: ../dgit:6718 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:6717 +#: ../dgit:6725 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1323,54 +1323,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:6743 +#: ../dgit:6751 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6749 +#: ../dgit:6757 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6752 +#: ../dgit:6760 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6795 +#: ../dgit:6803 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6833 +#: ../dgit:6841 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6840 +#: ../dgit:6848 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6847 +#: ../dgit:6855 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6851 +#: ../dgit:6859 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6856 +#: ../dgit:6864 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6859 +#: ../dgit:6867 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6872 +#: ../dgit:6880 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1378,136 +1378,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6890 +#: ../dgit:6898 msgid "build successful\n" msgstr "" -#: ../dgit:6898 +#: ../dgit:6906 #, 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:7009 +#: ../dgit:7017 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7046 +#: ../dgit:7054 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7066 +#: ../dgit:7074 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7079 +#: ../dgit:7087 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7083 +#: ../dgit:7091 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7090 +#: ../dgit:7098 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7096 +#: ../dgit:7104 msgid "source changes file" msgstr "" -#: ../dgit:7098 +#: ../dgit:7106 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7118 ../dgit:7120 +#: ../dgit:7126 ../dgit:7128 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7134 +#: ../dgit:7142 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:7147 +#: ../dgit:7155 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7151 +#: ../dgit:7159 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:7181 +#: ../dgit:7189 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7202 +#: ../dgit:7210 msgid "source tree" msgstr "" -#: ../dgit:7204 +#: ../dgit:7212 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7217 +#: ../dgit:7225 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7221 +#: ../dgit:7229 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7225 +#: ../dgit:7233 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7242 +#: ../dgit:7250 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7247 +#: ../dgit:7255 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7249 +#: ../dgit:7257 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7260 +#: ../dgit:7268 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7263 +#: ../dgit:7271 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7274 +#: ../dgit:7282 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7294 +#: ../dgit:7302 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1515,21 +1515,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7301 +#: ../dgit:7309 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7303 +#: ../dgit:7311 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7313 +#: ../dgit:7321 #, perl-format msgid "" "Branch %s already exists\n" @@ -1537,129 +1537,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7341 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7335 +#: ../dgit:7343 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7343 +#: ../dgit:7351 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7362 +#: ../dgit:7370 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7366 +#: ../dgit:7374 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7367 +#: ../dgit:7375 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7378 +#: ../dgit:7386 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7380 +#: ../dgit:7388 msgid "Import, merging." msgstr "" -#: ../dgit:7394 +#: ../dgit:7402 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7403 +#: ../dgit:7411 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7410 +#: ../dgit:7418 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7428 +#: ../dgit:7436 msgid "need destination argument" msgstr "" -#: ../dgit:7433 +#: ../dgit:7441 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7449 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7452 +#: ../dgit:7460 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7458 +#: ../dgit:7466 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7465 ../dgit:7471 +#: ../dgit:7473 ../dgit:7479 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7477 +#: ../dgit:7485 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7524 +#: ../dgit:7532 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7563 +#: ../dgit:7571 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7567 +#: ../dgit:7575 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7667 +#: ../dgit:7675 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7740 +#: ../dgit:7748 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7755 +#: ../dgit:7763 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7759 +#: ../dgit:7767 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7765 +#: ../dgit:7773 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1667,35 +1667,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7782 +#: ../dgit:7790 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7795 +#: ../dgit:7803 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7815 +#: ../dgit:7823 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7826 +#: ../dgit:7834 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7854 +#: ../dgit:7862 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7855 +#: ../dgit:7863 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7874 +#: ../dgit:7882 #, perl-format msgid "unknown operation %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_9.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-06 22:47+0000\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: 2019-11-10 22:17+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -19,74 +19,74 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.11\n" -#: ../dgit:267 +#: ../dgit:268 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:274 +#: ../dgit:275 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:282 +#: ../dgit:283 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:287 +#: ../dgit:288 #, 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:519 +#: ../dgit:520 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:524 ../dgit:530 +#: ../dgit:525 ../dgit:531 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:525 +#: ../dgit:526 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:533 +#: ../dgit:534 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:540 +#: ../dgit:541 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:548 +#: ../dgit:549 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:569 +#: ../dgit:570 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:572 +#: ../dgit:573 msgid "data block" msgstr "gegevensblok" -#: ../dgit:651 +#: ../dgit:652 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:653 +#: ../dgit:654 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:678 +#: ../dgit:679 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -126,13 +126,13 @@ msgstr "" " -c<naam>=<waarde> configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:697 +#: ../dgit:698 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:701 +#: ../dgit:702 #, perl-format msgid "" "%s: %s\n" @@ -141,22 +141,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:706 +#: ../dgit:707 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:822 +#: ../dgit:823 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:825 +#: ../dgit:826 #, 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:845 +#: ../dgit:846 #, perl-format msgid "" "need value for one of: %s\n" @@ -165,44 +165,44 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:902 +#: ../dgit:903 #, 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:917 +#: ../dgit:918 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:933 +#: ../dgit:934 #, 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:953 +#: ../dgit:954 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:971 +#: ../dgit:972 #, perl-format msgid "unknown %s `%s'" msgstr "onbekend %s `%s'" -#: ../dgit:976 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 msgid "internal error" msgstr "interne fout" -#: ../dgit:978 +#: ../dgit:979 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:982 +#: ../dgit:983 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -211,7 +211,7 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1005 +#: ../dgit:1006 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " @@ -220,76 +220,75 @@ msgstr "" "dgit: quilt modus `%s' (voor indeling `%s') impliceert gesplitste weergave, " "maar gesplitste weergave staat ingesteld op `%s'" -#: ../dgit:1168 +#: ../dgit:1169 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:1236 +#: ../dgit:1237 #, perl-format -#| msgid "fetch of %s gave HTTP code %s" msgid "fetch of %s failed (%s): %s" msgstr "ophalen (fetch) van %s mislukte (%s): %s" -#: ../dgit:1243 +#: ../dgit:1244 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1264 +#: ../dgit:1265 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1282 +#: ../dgit:1283 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1286 +#: ../dgit:1287 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1288 +#: ../dgit:1289 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1290 +#: ../dgit:1291 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1292 ../dgit:1317 +#: ../dgit:1293 ../dgit:1318 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1306 +#: ../dgit:1307 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1308 +#: ../dgit:1309 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1311 +#: ../dgit:1312 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1313 +#: ../dgit:1314 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1364 +#: ../dgit:1365 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1448 +#: ../dgit:1449 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -302,21 +301,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1472 +#: ../dgit:1473 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1498 +#: ../dgit:1499 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1499 +#: ../dgit:1500 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1604 +#: ../dgit:1605 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -325,134 +324,134 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1743 +#: ../dgit:1744 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1746 +#: ../dgit:1747 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1748 +#: ../dgit:1749 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1768 +#: ../dgit:1769 #, 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:1774 +#: ../dgit:1775 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1801 +#: ../dgit:1802 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1824 +#: ../dgit:1825 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1839 +#: ../dgit:1840 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1876 +#: ../dgit:1877 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1922 +#: ../dgit:1923 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1933 +#: ../dgit:1934 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1979 +#: ../dgit:1980 #, 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:1988 +#: ../dgit:1989 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1992 +#: ../dgit:1993 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1998 +#: ../dgit:1999 #, 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:2038 +#: ../dgit:2039 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2051 +#: ../dgit:2052 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2064 +#: ../dgit:2065 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:2080 +#: ../dgit:2081 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2085 +#: ../dgit:2086 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2093 +#: ../dgit:2094 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2128 +#: ../dgit:2129 #, 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:2136 +#: ../dgit:2137 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2139 +#: ../dgit:2140 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2158 +#: ../dgit:2159 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -461,7 +460,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2181 +#: ../dgit:2182 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -488,7 +487,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2193 +#: ../dgit:2194 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -496,24 +495,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2224 +#: ../dgit:2225 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2226 +#: ../dgit:2227 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2228 +#: ../dgit:2229 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -521,80 +520,80 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2262 +#: ../dgit:2263 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2264 +#: ../dgit:2265 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2267 +#: ../dgit:2268 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2276 +#: ../dgit:2277 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2280 +#: ../dgit:2281 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2283 +#: ../dgit:2284 #, 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:2289 +#: ../dgit:2290 #, 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:2360 +#: ../dgit:2361 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2422 +#: ../dgit:2423 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2462 +#: ../dgit:2463 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2531 ../dgit:2536 +#: ../dgit:2532 ../dgit:2537 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2551 ../dgit:2558 +#: ../dgit:2552 ../dgit:2559 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2584 ../dgit:6070 +#: ../dgit:2585 ../dgit:6078 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2662 +#: ../dgit:2665 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2681 +#: ../dgit:2684 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2690 +#: ../dgit:2693 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -607,16 +606,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2705 +#: ../dgit:2713 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2709 +#: ../dgit:2717 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2729 +#: ../dgit:2737 #, perl-format msgid "" "\n" @@ -629,12 +628,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2771 +#: ../dgit:2779 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2775 +#: ../dgit:2783 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -643,12 +642,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2779 +#: ../dgit:2787 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2795 +#: ../dgit:2803 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -656,24 +655,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2890 +#: ../dgit:2898 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2905 +#: ../dgit:2913 #, 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:2949 +#: ../dgit:2957 #, 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:2964 +#: ../dgit:2972 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" @@ -683,7 +682,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run.\n" -#: ../dgit:2969 +#: ../dgit:2977 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -699,19 +698,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:3116 +#: ../dgit:3124 #, 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:3121 +#: ../dgit:3129 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3126 +#: ../dgit:3134 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -720,7 +719,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3136 +#: ../dgit:3144 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -733,30 +732,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3156 +#: ../dgit:3164 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3163 +#: ../dgit:3171 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:3167 +#: ../dgit:3175 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3169 +#: ../dgit:3177 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:3176 +#: ../dgit:3184 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3179 +#: ../dgit:3187 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -765,27 +764,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3204 +#: ../dgit:3212 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3208 +#: ../dgit:3216 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3291 +#: ../dgit:3299 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3298 +#: ../dgit:3306 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3303 +#: ../dgit:3311 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3331 +#: ../dgit:3339 #, perl-format msgid "" "\n" @@ -801,15 +800,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3344 +#: ../dgit:3352 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3347 +#: ../dgit:3355 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3368 +#: ../dgit:3376 #, perl-format msgid "" "\n" @@ -821,7 +820,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3377 +#: ../dgit:3385 #, perl-format msgid "" "\n" @@ -836,7 +835,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3462 +#: ../dgit:3470 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -847,19 +846,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3475 +#: ../dgit:3483 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3493 +#: ../dgit:3501 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3495 +#: ../dgit:3503 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3506 +#: ../dgit:3514 #, perl-format msgid "" "\n" @@ -875,15 +874,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3521 +#: ../dgit:3529 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3557 +#: ../dgit:3565 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3622 +#: ../dgit:3630 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -891,16 +890,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3636 +#: ../dgit:3644 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:3651 +#: ../dgit:3659 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3678 +#: ../dgit:3686 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -911,32 +910,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3700 +#: ../dgit:3708 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3708 +#: ../dgit:3716 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3747 +#: ../dgit:3755 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3779 +#: ../dgit:3787 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3781 +#: ../dgit:3789 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:3820 +#: ../dgit:3828 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -947,7 +946,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3834 +#: ../dgit:3842 msgid "" "\n" "Key\n" @@ -961,34 +960,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3849 +#: ../dgit:3857 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3867 +#: ../dgit:3875 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3885 +#: ../dgit:3893 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3900 +#: ../dgit:3908 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3912 +#: ../dgit:3920 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3915 +#: ../dgit:3923 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3940 +#: ../dgit:3948 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -998,33 +997,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3945 +#: ../dgit:3953 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3957 +#: ../dgit:3965 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3959 +#: ../dgit:3967 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3967 +#: ../dgit:3975 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3978 +#: ../dgit:3986 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:3997 +#: ../dgit:4005 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1033,15 +1032,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:4014 +#: ../dgit:4022 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:4017 +#: ../dgit:4025 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:4021 +#: ../dgit:4029 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1049,7 +1048,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4065 +#: ../dgit:4073 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1057,60 +1056,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4070 +#: ../dgit:4078 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4080 +#: ../dgit:4088 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4086 +#: ../dgit:4094 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4112 +#: ../dgit:4120 #, 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:4115 +#: ../dgit:4123 #, 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:4123 +#: ../dgit:4131 #, 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:4132 +#: ../dgit:4140 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4141 +#: ../dgit:4149 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4149 +#: ../dgit:4157 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4160 +#: ../dgit:4168 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4163 +#: ../dgit:4171 #, perl-format msgid "" "%s is %s\n" @@ -1119,99 +1118,99 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4177 +#: ../dgit:4185 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4233 +#: ../dgit:4241 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4242 +#: ../dgit:4250 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4244 +#: ../dgit:4252 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4245 +#: ../dgit:4253 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4258 +#: ../dgit:4266 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:4268 +#: ../dgit:4276 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4269 +#: ../dgit:4277 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4273 +#: ../dgit:4281 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4286 +#: ../dgit:4294 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4294 +#: ../dgit:4302 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4306 +#: ../dgit:4314 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4328 +#: ../dgit:4336 #, 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:4382 +#: ../dgit:4390 #, 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:5642 +#: ../dgit:5650 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5660 +#: ../dgit:5668 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5669 +#: ../dgit:5677 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5675 +#: ../dgit:5683 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5687 +#: ../dgit:5695 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5706 +#: ../dgit:5714 #, perl-format msgid "" "\n" @@ -1220,23 +1219,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5713 +#: ../dgit:5721 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5725 +#: ../dgit:5733 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:5728 +#: ../dgit:5736 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5740 +#: ../dgit:5748 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1247,43 +1246,43 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5747 +#: ../dgit:5755 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5781 +#: ../dgit:5789 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5782 +#: ../dgit:5790 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5783 +#: ../dgit:5791 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5784 +#: ../dgit:5792 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5785 +#: ../dgit:5793 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5789 +#: ../dgit:5797 #, 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:5818 +#: ../dgit:5826 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5901 +#: ../dgit:5909 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" @@ -1291,45 +1290,45 @@ msgid "" msgstr "" "quilt modus %s is zinloos (of wordt niet ondersteund) met single-debian-patch" -#: ../dgit:5919 +#: ../dgit:5927 msgid "converted" msgstr "omgezet" -#: ../dgit:5920 +#: ../dgit:5928 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5974 +#: ../dgit:5982 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5984 +#: ../dgit:5992 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6094 +#: ../dgit:6102 #, 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:6126 +#: ../dgit:6134 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6131 +#: ../dgit:6139 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6166 +#: ../dgit:6174 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6280 +#: ../dgit:6288 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" @@ -1344,37 +1343,37 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6294 +#: ../dgit:6302 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6328 +#: ../dgit:6336 msgid "baredebian quilt fixup: could not find any origs" msgstr "baredebian quilt reparatie: kon geen origs vinden" -#: ../dgit:6341 +#: ../dgit:6349 msgid "tarball" msgstr "tar-archief" -#: ../dgit:6359 +#: ../dgit:6367 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr " Combineren van orig tar-archieven voor %s %s" -#: ../dgit:6375 +#: ../dgit:6383 msgid "tarballs" msgstr "tar-archieven" -#: ../dgit:6389 +#: ../dgit:6397 msgid "upstream" msgstr "bovenstrooms" -#: ../dgit:6413 +#: ../dgit:6421 #, 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:6423 +#: ../dgit:6431 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1383,54 +1382,54 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: %9.00009s %s o+d/p %9.00009s %s o+d/p" -#: ../dgit:6432 +#: ../dgit:6440 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6436 +#: ../dgit:6444 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:6443 +#: ../dgit:6451 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "Dit bevat enkel een map debian/; wellicht wilt u --quilt=bare debian." -#: ../dgit:6447 +#: ../dgit:6455 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6450 +#: ../dgit:6458 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6453 +#: ../dgit:6461 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:6456 +#: ../dgit:6464 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6460 +#: ../dgit:6468 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:6471 +#: ../dgit:6479 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6510 +#: ../dgit:6518 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1445,13 +1444,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6522 +#: ../dgit:6530 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:6551 +#: ../dgit:6559 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" @@ -1463,18 +1462,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6563 +#: ../dgit:6571 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6566 +#: ../dgit:6574 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:6569 +#: ../dgit:6577 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1482,7 +1481,7 @@ 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:6582 +#: ../dgit:6590 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" @@ -1491,21 +1490,21 @@ msgstr "" "quilt modus %s (heeft meestal niet gevolgde bovenstroomse bestanden nodig)\n" "is in strijd met clean modus %s (welke deze zou verwijderen)\n" -#: ../dgit:6599 +#: ../dgit:6607 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6613 +#: ../dgit:6621 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6632 +#: ../dgit:6640 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "-p specificeerde pakket %s, maar het changelog-bestand vermeldt %s" -#: ../dgit:6642 +#: ../dgit:6650 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" @@ -1513,34 +1512,33 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " "inbegrip van quilt-modi welke de weergave splitsen)" -#: ../dgit:6651 +#: ../dgit:6659 #, perl-format -#| msgid "dgit: import-dsc: %s" msgid "dgit: --quilt=%s, %s" msgstr "dgit: --quilt=%s, %s" -#: ../dgit:6655 +#: ../dgit:6663 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "dgit: --upstream-commitish is enkel zinvol met --quilt=baredebian" -#: ../dgit:6690 +#: ../dgit:6698 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6692 +#: ../dgit:6700 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6710 +#: ../dgit:6718 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" "waarschuwing: aan de commandoregel van dgit moet de optie %s van dgit " "opgegeven worden voor %s\n" -#: ../dgit:6717 +#: ../dgit:6725 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1551,56 +1549,56 @@ msgstr "" "worden aan dgit voor het sub-commando %s, zodat het door dgit gezien wordt " "en niet enkel meegegeven wordt aan %s\n" -#: ../dgit:6743 +#: ../dgit:6751 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:6749 +#: ../dgit:6757 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6752 +#: ../dgit:6760 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6795 +#: ../dgit:6803 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6833 +#: ../dgit:6841 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6840 +#: ../dgit:6848 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6847 +#: ../dgit:6855 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6851 +#: ../dgit:6859 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6856 +#: ../dgit:6864 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6859 +#: ../dgit:6867 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6872 +#: ../dgit:6880 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1612,11 +1610,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6890 +#: ../dgit:6898 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6898 +#: ../dgit:6906 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1627,30 +1625,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:7009 +#: ../dgit:7017 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:7046 +#: ../dgit:7054 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7066 +#: ../dgit:7074 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7079 +#: ../dgit:7087 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7083 +#: ../dgit:7091 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7090 +#: ../dgit:7098 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -1658,21 +1656,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7096 +#: ../dgit:7104 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7098 +#: ../dgit:7106 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7118 ../dgit:7120 +#: ../dgit:7126 ../dgit:7128 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7134 +#: ../dgit:7142 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" @@ -1681,7 +1679,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7147 +#: ../dgit:7155 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -1689,7 +1687,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7151 +#: ../dgit:7159 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -1698,65 +1696,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7181 +#: ../dgit:7189 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7202 +#: ../dgit:7210 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7204 +#: ../dgit:7212 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7217 +#: ../dgit:7225 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7221 +#: ../dgit:7229 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7225 +#: ../dgit:7233 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7242 +#: ../dgit:7250 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7247 +#: ../dgit:7255 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7249 +#: ../dgit:7257 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7260 +#: ../dgit:7268 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7263 +#: ../dgit:7271 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7274 +#: ../dgit:7282 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7285 +#: ../dgit:7293 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:7294 +#: ../dgit:7302 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1767,21 +1765,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:7301 +#: ../dgit:7309 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:7303 +#: ../dgit:7311 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7313 +#: ../dgit:7321 #, perl-format msgid "" "Branch %s already exists\n" @@ -1793,88 +1791,88 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7333 +#: ../dgit:7341 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7335 +#: ../dgit:7343 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7343 +#: ../dgit:7351 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7362 +#: ../dgit:7370 #, 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:7366 +#: ../dgit:7374 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7367 +#: ../dgit:7375 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7378 +#: ../dgit:7386 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7380 +#: ../dgit:7388 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7394 +#: ../dgit:7402 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7403 +#: ../dgit:7411 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7410 +#: ../dgit:7418 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7428 +#: ../dgit:7436 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7433 +#: ../dgit:7441 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7441 +#: ../dgit:7449 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:7452 +#: ../dgit:7460 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7458 +#: ../dgit:7466 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7465 ../dgit:7471 +#: ../dgit:7473 ../dgit:7479 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7477 +#: ../dgit:7485 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7524 +#: ../dgit:7532 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -1882,42 +1880,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7563 +#: ../dgit:7571 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7567 +#: ../dgit:7575 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7667 +#: ../dgit:7675 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7685 +#: ../dgit:7693 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7740 +#: ../dgit:7748 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7755 +#: ../dgit:7763 #, 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:7759 +#: ../dgit:7767 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7765 +#: ../dgit:7773 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1928,37 +1926,37 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7782 +#: ../dgit:7790 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7795 +#: ../dgit:7803 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7815 +#: ../dgit:7823 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7826 +#: ../dgit:7834 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7854 +#: ../dgit:7862 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7855 +#: ../dgit:7863 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7874 +#: ../dgit:7882 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 9ea9bb1..3410d8b 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-09-08 20:11+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,13 +28,13 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:254 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -68,9 +68,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../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 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 +#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:354 msgid "When upstream tags releases in git" msgstr "" @@ -108,8 +108,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 #, no-wrap msgid "" " % git deborig\n" @@ -166,40 +166,25 @@ 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 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:366 msgid "When upstream releases only tarballs" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 -#, no-wrap -msgid "" -" % mkdir foo\n" -" % cd foo\n" -" % git init\n" -"\n" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 -msgid "Now create I<debian/gbp.conf>:" -msgstr "" - -#. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 #, no-wrap msgid "" " [DEFAULT]\n" " upstream-branch = upstream\n" " debian-branch = master\n" -" upstream-tag = %(version)s\n" +" upstream-tag = upstream/%(version)s\n" "\n" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 #, no-wrap msgid "" " sign-tags = True\n" @@ -209,54 +194,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 -#, no-wrap -msgid "" -" [import-orig]\n" -" merge-mode = merge\n" -"\n" -msgstr "" - -#. type: textblock -#: ../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:184 ../dgit-maint-debrebase.7.pod:199 -#, no-wrap -msgid "" -" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" -" % git checkout --orphan upstream\n" -" % git rm -rf .\n" -" % git commit --allow-empty -m \"initial, empty branch for upstream source\"\n" -" % git checkout -f master\n" -"\n" -msgstr "" - -#. type: textblock -#: ../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:196 ../dgit-maint-debrebase.7.pod:211 -#, no-wrap -msgid "" -" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" -"\n" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 -msgid "" -"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " -"need it whenever we import a new upstream version, we must push it " -"somewhere. The usual choice is B<salsa.debian.org>:" -msgstr "" - -#. type: verbatim -#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 +#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -265,19 +203,19 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 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:255 ../dgit-maint-debrebase.7.pod:266 +#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -285,24 +223,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 +#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 +#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -310,7 +248,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 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 " @@ -318,7 +256,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -327,33 +265,33 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 +#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 +#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 #, no-wrap msgid "" -" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" +" % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" -" % gbp import-orig --no-merge --uscan\n" +" % gbp import-orig --uscan\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 +#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 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 " @@ -361,12 +299,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 +#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 +#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -375,20 +313,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:582 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:586 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 -#: ../git-debpush.1.pod:259 +#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 +#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -396,7 +334,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:326 msgid "GIT CONFIGURATION" msgstr "" @@ -535,8 +473,34 @@ msgid "" "virtual release tags. gbp-import-orig(1) can manage this for us. To begin" msgstr "" +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:171 +#, no-wrap +msgid "" +" % mkdir foo\n" +" % cd foo\n" +" % git init\n" +" % git checkout -b upstream\n" +" % gbp import-orig \\\n" +" --upstream-branch=upstream --debian-branch=master \\\n" +" --upstream-tag='upstream/%(version)s' \\\n" +" --sign-tags --no-pristine-tar \\\n" +" ../foo_1.2.2.orig.tar.xz\n" +" % git branch -f upstream\n" +"\n" +msgstr "" + #. type: textblock -#: ../dgit-maint-debrebase.7.pod:226 +#: ../dgit-maint-debrebase.7.pod:184 +msgid "" +"This should leave you on the master branch. Next, our upstream branch " +"cannot be pushed to B<dgit-repos>, but since we will need it whenever we " +"import a new upstream version, we must push it somewhere. The usual choice " +"is B<salsa.debian.org>:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:196 msgid "" "You are now ready to proceed as above, making commits to the I<debian/> " "directory and to the upstream source. As above, for technical reasons, B<it " @@ -546,7 +510,45 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:238 +#: ../dgit-maint-debrebase.7.pod:203 +msgid "" +"A convenient way to ensure this requirement is satisfied is to start by " +"creating I<debian/gbp.conf>:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:217 +#, no-wrap +msgid "" +" [import-orig]\n" +" merge = False\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:222 +msgid "and commit that:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:226 +#, no-wrap +msgid "" +" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:230 +msgid "" +"Note that we couldn't create I<debian/gbp.conf> before now for the same " +"technical reasons which require our first commit to introduce I<debian/> " +"without patching the upstream source. That's why we had to pass a lot of " +"options to our first call to gbp-import-orig(1)." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:240 msgid "" "If you have an existing git history that you have pushed to an ordinary git " "server like B<salsa.debian.org>, we start with that. If you don't already " @@ -555,7 +557,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:245 +#: ../dgit-maint-debrebase.7.pod:247 #, no-wrap msgid "" " % git clone salsa.debian.org:Debian/foo\n" @@ -566,14 +568,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:252 +#: ../dgit-maint-debrebase.7.pod:254 msgid "" "If you don't have any existing git history, or you have history only on the " "special B<dgit-repos> server, we start with B<dgit clone>:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:257 +#: ../dgit-maint-debrebase.7.pod:259 #, no-wrap msgid "" " % dgit clone foo\n" @@ -582,12 +584,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:262 +#: ../dgit-maint-debrebase.7.pod:264 msgid "Then we make new upstream tags available:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:270 +#: ../dgit-maint-debrebase.7.pod:272 msgid "" "We now use a B<git debrebase convert-from-*> command to convert your " "existing history to the git-debrebase(5) data model. Which command you " @@ -595,17 +597,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:276 +#: ../dgit-maint-debrebase.7.pod:278 msgid "(A) There is no delta queue." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:278 +#: ../dgit-maint-debrebase.7.pod:280 msgid "If there do not exist any Debian patches, use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294 +#: ../dgit-maint-debrebase.7.pod:284 ../dgit-maint-debrebase.7.pod:296 #, no-wrap msgid "" " % git debrebase convert-from-gbp\n" @@ -613,12 +615,12 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:286 +#: ../dgit-maint-debrebase.7.pod:288 msgid "(B) There is a delta queue, and patches are unapplied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:288 +#: ../dgit-maint-debrebase.7.pod:290 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. " @@ -626,7 +628,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:298 +#: ../dgit-maint-debrebase.7.pod:300 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 " @@ -635,17 +637,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:303 +#: ../dgit-maint-debrebase.7.pod:305 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:305 +#: ../dgit-maint-debrebase.7.pod:307 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:309 +#: ../dgit-maint-debrebase.7.pod:311 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -653,7 +655,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:315 +#: ../dgit-maint-debrebase.7.pod:317 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<dpkg-" @@ -661,7 +663,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:326 +#: ../dgit-maint-debrebase.7.pod:328 msgid "" "git-debrebase(1) does not yet support using B<git merge> to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -669,7 +671,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:333 +#: ../dgit-maint-debrebase.7.pod:335 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -677,14 +679,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:337 +#: ../dgit-maint-debrebase.7.pod:339 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:340 +#: ../dgit-maint-debrebase.7.pod:342 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 " @@ -693,24 +695,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:345 +#: ../dgit-maint-debrebase.7.pod:347 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:347 +#: ../dgit-maint-debrebase.7.pod:349 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:387 +#: ../dgit-maint-debrebase.7.pod:389 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:391 +#: ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -718,7 +720,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:395 +#: ../dgit-maint-debrebase.7.pod:397 +msgid "replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:399 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 " @@ -726,13 +733,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:399 +#: ../dgit-maint-debrebase.7.pod:403 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:404 +#: ../dgit-maint-debrebase.7.pod:408 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -740,7 +747,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:408 +#: ../dgit-maint-debrebase.7.pod:412 msgid "" "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 " @@ -749,27 +756,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-debrebase.7.pod:427 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:425 +#: ../dgit-maint-debrebase.7.pod:429 msgid "Just make commits on master that change the contents of I<debian/>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:427 +#: ../dgit-maint-debrebase.7.pod:431 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:429 +#: ../dgit-maint-debrebase.7.pod:433 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:431 +#: ../dgit-maint-debrebase.7.pod:435 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I<debian/> directory. You can also use tools like git-" @@ -777,19 +784,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:439 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:437 +#: ../dgit-maint-debrebase.7.pod:441 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:442 ../dgit-maint-debrebase.7.pod:745 +#: ../dgit-maint-debrebase.7.pod:446 ../dgit-maint-debrebase.7.pod:749 #, no-wrap msgid "" " % git debrebase -i\n" @@ -797,19 +804,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:446 +#: ../dgit-maint-debrebase.7.pod:450 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B<git rebase -i>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:449 +#: ../dgit-maint-debrebase.7.pod:453 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:451 +#: ../dgit-maint-debrebase.7.pod:455 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 " @@ -818,14 +825,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:457 +#: ../dgit-maint-debrebase.7.pod:461 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B<salsa.debian.org>," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:462 +#: ../dgit-maint-debrebase.7.pod:466 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -833,7 +840,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:466 +#: ../dgit-maint-debrebase.7.pod:470 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 " @@ -843,7 +850,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:474 +#: ../dgit-maint-debrebase.7.pod:478 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit " @@ -851,14 +858,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:478 +#: ../dgit-maint-debrebase.7.pod:482 msgid "" "Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> " "if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:481 +#: ../dgit-maint-debrebase.7.pod:485 msgid "" "In some cases where you used B<git debrebase convert-from-gbp> since the " "last upload, it is not possible for dgit to make your history fast-" @@ -868,7 +875,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:487 +#: ../dgit-maint-debrebase.7.pod:491 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 " @@ -876,7 +883,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:493 +#: ../dgit-maint-debrebase.7.pod:497 #, no-wrap msgid "" " % git debrebase\n" @@ -885,24 +892,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:498 +#: ../dgit-maint-debrebase.7.pod:502 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:500 +#: ../dgit-maint-debrebase.7.pod:504 msgid "" "After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:505 +#: ../dgit-maint-debrebase.7.pod:509 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-debrebase.7.pod:511 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 " @@ -910,7 +917,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:511 +#: ../dgit-maint-debrebase.7.pod:515 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -922,12 +929,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:517 +#: ../dgit-maint-debrebase.7.pod:521 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:519 +#: ../dgit-maint-debrebase.7.pod:523 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 " @@ -936,12 +943,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:525 +#: ../dgit-maint-debrebase.7.pod:529 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:529 +#: ../dgit-maint-debrebase.7.pod:533 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -953,14 +960,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:537 +#: ../dgit-maint-debrebase.7.pod:541 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:542 +#: ../dgit-maint-debrebase.7.pod:546 #, no-wrap msgid "" " % git branch --unset-upstream\n" @@ -969,18 +976,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:547 +#: ../dgit-maint-debrebase.7.pod:551 msgid "and proceed with \"INITIAL DEBIANISATION\"." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:549 +#: ../dgit-maint-debrebase.7.pod:553 msgid "" "For subsequent releases (whether or not they require additional filtering):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:554 +#: ../dgit-maint-debrebase.7.pod:558 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -994,7 +1001,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:564 +#: ../dgit-maint-debrebase.7.pod:568 msgid "" "Our upstream-dfsg branch cannot be pushed to B<dgit-repos>, but since we " "will need it whenever we import a new upstream version, we must push it " @@ -1003,7 +1010,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:571 +#: ../dgit-maint-debrebase.7.pod:575 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -1011,17 +1018,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:575 +#: ../dgit-maint-debrebase.7.pod:579 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:584 +#: ../dgit-maint-debrebase.7.pod:588 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:588 +#: ../dgit-maint-debrebase.7.pod:592 #, no-wrap msgid "" " % dgit fetch\n" @@ -1030,7 +1037,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:593 +#: ../dgit-maint-debrebase.7.pod:597 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 " @@ -1038,7 +1045,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:597 +#: ../dgit-maint-debrebase.7.pod:601 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I<debian/patches>. Changes there would either cause trouble, or be " @@ -1046,12 +1053,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:601 +#: ../dgit-maint-debrebase.7.pod:605 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:605 +#: ../dgit-maint-debrebase.7.pod:609 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -1059,14 +1066,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:609 +#: ../dgit-maint-debrebase.7.pod:613 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:612 +#: ../dgit-maint-debrebase.7.pod:616 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 " @@ -1074,12 +1081,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:616 +#: ../dgit-maint-debrebase.7.pod:620 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:618 +#: ../dgit-maint-debrebase.7.pod:622 msgid "" "If you cannot rebase because you have already pushed to B<salsa.debian.org>, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " @@ -1087,24 +1094,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:623 +#: ../dgit-maint-debrebase.7.pod:627 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:625 +#: ../dgit-maint-debrebase.7.pod:629 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:627 +#: ../dgit-maint-debrebase.7.pod:631 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:630 +#: ../dgit-maint-debrebase.7.pod:634 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B<git debrebase conclude> only right before you upload or push to B<salsa." @@ -1112,7 +1119,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:634 +#: ../dgit-maint-debrebase.7.pod:638 msgid "" "It is possible, though much less convenient, to reduce the number of " "pseudomerges yet further. We debrebase only (i) when importing a new " @@ -1124,12 +1131,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:642 +#: ../dgit-maint-debrebase.7.pod:646 msgid "The debian/patches directory" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:644 +#: ../dgit-maint-debrebase.7.pod:648 msgid "" "In this workflow, I<debian/patches> is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1137,7 +1144,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:649 +#: ../dgit-maint-debrebase.7.pod:653 msgid "" "I<debian/patches> 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 " @@ -1147,17 +1154,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:655 +#: ../dgit-maint-debrebase.7.pod:659 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:657 +#: ../dgit-maint-debrebase.7.pod:661 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:659 +#: ../dgit-maint-debrebase.7.pod:663 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1166,7 +1173,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:665 +#: ../dgit-maint-debrebase.7.pod:669 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 " @@ -1175,19 +1182,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:671 +#: ../dgit-maint-debrebase.7.pod:675 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I<remotes/upstream/master>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:674 +#: ../dgit-maint-debrebase.7.pod:678 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:676 +#: ../dgit-maint-debrebase.7.pod:680 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 " @@ -1197,12 +1204,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:682 +#: ../dgit-maint-debrebase.7.pod:686 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:684 +#: ../dgit-maint-debrebase.7.pod:688 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 " @@ -1210,12 +1217,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:688 +#: ../dgit-maint-debrebase.7.pod:692 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:692 +#: ../dgit-maint-debrebase.7.pod:696 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1223,17 +1230,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:694 +#: ../dgit-maint-debrebase.7.pod:698 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:698 +#: ../dgit-maint-debrebase.7.pod:702 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:700 +#: ../dgit-maint-debrebase.7.pod:704 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1241,12 +1248,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:702 +#: ../dgit-maint-debrebase.7.pod:706 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:704 +#: ../dgit-maint-debrebase.7.pod:708 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1254,12 +1261,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:706 +#: ../dgit-maint-debrebase.7.pod:710 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:710 +#: ../dgit-maint-debrebase.7.pod:714 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1267,7 +1274,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:712 +#: ../dgit-maint-debrebase.7.pod:716 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. --" @@ -1275,12 +1282,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:719 +#: ../dgit-maint-debrebase.7.pod:723 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:723 +#: ../dgit-maint-debrebase.7.pod:727 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1288,17 +1295,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:725 +#: ../dgit-maint-debrebase.7.pod:729 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:729 +#: ../dgit-maint-debrebase.7.pod:733 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:731 +#: ../dgit-maint-debrebase.7.pod:735 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1307,12 +1314,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:734 +#: ../dgit-maint-debrebase.7.pod:738 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:736 +#: ../dgit-maint-debrebase.7.pod:740 #, no-wrap msgid "" " % git debrebase status\n" @@ -1320,24 +1327,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:738 +#: ../dgit-maint-debrebase.7.pod:742 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:740 +#: ../dgit-maint-debrebase.7.pod:744 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:749 +#: ../dgit-maint-debrebase.7.pod:753 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:753 +#: ../dgit-maint-debrebase.7.pod:757 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1345,7 +1352,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:758 +#: ../dgit-maint-debrebase.7.pod:762 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 " @@ -1353,7 +1360,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:764 +#: ../dgit-maint-debrebase.7.pod:768 #, no-wrap msgid "" " % git debrebase\n" @@ -1362,7 +1369,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:769 +#: ../dgit-maint-debrebase.7.pod:773 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 " @@ -1372,6 +1379,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:780 +#: ../dgit-maint-debrebase.7.pod:784 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 7bd423c..b973a7a 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-09-08 20:11+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,31 +28,31 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:254 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -67,12 +67,12 @@ msgstr "" #. type: textblock #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-maint-merge.7.pod:526 ../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:514 +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:517 #, no-wrap msgid "" " % dgit pull\n" @@ -149,9 +149,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../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 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 +#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:354 msgid "When upstream tags releases in git" msgstr "" @@ -218,8 +218,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 #, no-wrap msgid "" " % git deborig\n" @@ -300,9 +300,9 @@ 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 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:366 msgid "When upstream releases only tarballs" msgstr "" @@ -314,7 +314,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-merge.7.pod:156 #, no-wrap msgid "" " % mkdir foo\n" @@ -324,23 +324,23 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 +#: ../dgit-maint-merge.7.pod:162 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 #, no-wrap msgid "" " [DEFAULT]\n" " upstream-branch = upstream\n" " debian-branch = master\n" -" upstream-tag = %(version)s\n" +" upstream-tag = upstream/%(version)s\n" "\n" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 #, no-wrap msgid "" " sign-tags = True\n" @@ -350,21 +350,22 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 +#: ../dgit-maint-merge.7.pod:175 #, no-wrap msgid "" " [import-orig]\n" " merge-mode = merge\n" +" merge = False\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:181 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 +#: ../dgit-maint-merge.7.pod:185 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -376,20 +377,20 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:193 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 +#: ../dgit-maint-merge.7.pod:197 #, no-wrap msgid "" -" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" +" % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215 +#: ../dgit-maint-merge.7.pod:201 msgid "" "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -397,7 +398,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 +#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -406,31 +407,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:211 +#: ../dgit-maint-merge.7.pod:212 msgid "" "You are now ready to proceed as above, making commits to both the upstream " "source and the I<debian/> directory." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 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:219 +#: ../dgit-maint-merge.7.pod:220 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:223 +#: ../dgit-maint-merge.7.pod:224 #, no-wrap msgid "" " % dgit clone foo\n" @@ -440,19 +441,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:229 +#: ../dgit-maint-merge.7.pod:230 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:231 +#: ../dgit-maint-merge.7.pod:232 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:236 +#: ../dgit-maint-merge.7.pod:237 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -462,12 +463,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 +#: ../dgit-maint-merge.7.pod:243 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:246 +#: ../dgit-maint-merge.7.pod:247 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -476,12 +477,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:251 +#: ../dgit-maint-merge.7.pod:252 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 +#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -489,12 +490,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:259 +#: ../dgit-maint-merge.7.pod:260 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:261 +#: ../dgit-maint-merge.7.pod:262 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<dpkg-buildpackage -i'(?:^|/)\\." @@ -502,19 +503,19 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:266 +#: ../dgit-maint-merge.7.pod:267 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 +#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:272 +#: ../dgit-maint-merge.7.pod:273 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-" @@ -525,24 +526,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:279 +#: ../dgit-maint-merge.7.pod:280 msgid "SOURCE PACKAGE CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:281 +#: ../dgit-maint-merge.7.pod:282 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:283 +#: ../dgit-maint-merge.7.pod:284 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:289 +#: ../dgit-maint-merge.7.pod:290 #, no-wrap msgid "" " single-debian-patch\n" @@ -551,26 +552,26 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:294 +#: ../dgit-maint-merge.7.pod:295 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:297 +#: ../dgit-maint-merge.7.pod:298 msgid "Sample text for debian/source/patch-header" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:299 +#: ../dgit-maint-merge.7.pod:300 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:304 +#: ../dgit-maint-merge.7.pod:305 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 " @@ -578,7 +579,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:308 +#: ../dgit-maint-merge.7.pod:309 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -587,7 +588,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:316 +#: ../dgit-maint-merge.7.pod:317 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -597,18 +598,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:322 +#: ../dgit-maint-merge.7.pod:323 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:325 +#: ../dgit-maint-merge.7.pod:326 msgid "A single combined diff, containing all the changes, follows." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:329 +#: ../dgit-maint-merge.7.pod:330 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 " @@ -616,7 +617,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:333 +#: ../dgit-maint-merge.7.pod:334 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 " @@ -624,12 +625,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:340 +#: ../dgit-maint-merge.7.pod:341 msgid "" "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, " "B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any " @@ -639,7 +640,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:346 +#: ../dgit-maint-merge.7.pod:347 msgid "" "As an alternative to B<dgit build> and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " @@ -650,7 +651,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:353 +#: ../dgit-maint-merge.7.pod:354 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), " @@ -658,17 +659,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:357 +#: ../dgit-maint-merge.7.pod:358 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 +#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -676,7 +677,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 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 " @@ -684,7 +685,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -693,38 +694,43 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 +#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 +#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 #, no-wrap msgid "" -" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" +" % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" -" % gbp import-orig --no-merge --uscan\n" +" % gbp import-orig --uscan\n" "\n" msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:397 +msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." +msgstr "" + #. type: =head2 -#: ../dgit-maint-merge.7.pod:396 +#: ../dgit-maint-merge.7.pod:399 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:398 +#: ../dgit-maint-merge.7.pod:401 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 " @@ -732,7 +738,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:404 +#: ../dgit-maint-merge.7.pod:407 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -740,12 +746,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:408 +#: ../dgit-maint-merge.7.pod:411 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:412 +#: ../dgit-maint-merge.7.pod:415 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -753,12 +759,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:416 +#: ../dgit-maint-merge.7.pod:419 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-merge.7.pod:423 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -768,7 +774,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 +#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 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 " @@ -776,17 +782,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 +#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:440 +#: ../dgit-maint-merge.7.pod:443 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:444 +#: ../dgit-maint-merge.7.pod:447 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -799,7 +805,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:453 +#: ../dgit-maint-merge.7.pod:456 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 " @@ -807,7 +813,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-merge.7.pod:461 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 " @@ -816,7 +822,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 +#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -825,40 +831,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:470 +#: ../dgit-maint-merge.7.pod:473 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:472 +#: ../dgit-maint-merge.7.pod:475 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:478 +#: ../dgit-maint-merge.7.pod:481 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:482 +#: ../dgit-maint-merge.7.pod:485 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:487 +#: ../dgit-maint-merge.7.pod:490 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:492 +#: ../dgit-maint-merge.7.pod:495 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:496 +#: ../dgit-maint-merge.7.pod:499 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -872,7 +878,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:506 +#: ../dgit-maint-merge.7.pod:509 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -880,27 +886,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:582 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:586 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:518 +#: ../dgit-maint-merge.7.pod:521 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:525 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 -#: ../git-debpush.1.pod:259 +#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 +#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 0f36132..c7d489b 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-09-14 20:40+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1271 +#: ../dgit.1:185 ../dgit.1:1278 msgid "Print a usage summary." msgstr "" @@ -595,7 +595,7 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 #, no-wrap msgid "1." msgstr "" @@ -607,7 +607,7 @@ msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 #, no-wrap msgid "2." msgstr "" @@ -619,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 #, no-wrap msgid "3." msgstr "" @@ -956,7 +956,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:476 +#: ../dgit.1:496 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" @@ -1274,22 +1274,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:683 +#: ../dgit.1:685 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 " -"branch a fast forward from the NMU." +"branch a fast forward from the NMU. It can also be useful when there was an " +"upload made without dgit since the most recent upload made with dgit." msgstr "" #. type: Plain text -#: ../dgit.1:689 +#: ../dgit.1:691 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:703 +#: ../dgit.1:705 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1300,7 +1301,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:709 +#: ../dgit.1:711 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1309,7 +1310,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:714 +#: ../dgit.1:716 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1317,18 +1318,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:714 +#: ../dgit.1:716 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:717 +#: ../dgit.1:719 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:727 +#: ../dgit.1:729 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1338,27 +1339,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:732 +#: ../dgit.1:734 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:732 +#: ../dgit.1:734 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:738 +#: ../dgit.1:740 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:748 +#: ../dgit.1:750 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1367,7 +1368,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:756 +#: ../dgit.1:758 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1376,13 +1377,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:756 +#: ../dgit.1:758 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:766 +#: ../dgit.1:768 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1391,7 +1392,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:770 +#: ../dgit.1:772 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1399,25 +1400,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:774 +#: ../dgit.1:776 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:778 +#: ../dgit.1:780 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:778 +#: ../dgit.1:780 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:792 +#: ../dgit.1:794 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1429,22 +1430,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:792 +#: ../dgit.1:794 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:799 +#: ../dgit.1:800 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 " -"source package whose previous version was not accepted for release from NEW " -"because of problems with copyright or redistributibility." +"Declare that you are deliberately rewriting history. This could be because " +"your branch is not fast forward from the dgit server history, or not fast " +"forward from a locally-synthesised dsc import." msgstr "" #. type: Plain text -#: ../dgit.1:810 +#: ../dgit.1:806 +msgid "" +"When pushing to Debian, use this only when you are making a renewed upload " +"of an entirely new source package whose previous version was not accepted " +"for release from NEW because of problems with copyright or " +"redistributibility; or, exceptionally, for the very first upload with dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:817 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1454,13 +1463,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:810 +#: ../dgit.1:817 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:819 +#: ../dgit.1:826 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1472,27 +1481,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:819 +#: ../dgit.1:826 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:824 +#: ../dgit.1:831 msgid "" -"Declare that you are deliberately rewinding history and want to throw away " +"Declare that you are deliberately rewriting 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: =item -#: ../dgit.1:824 ../git-debpush.1.pod:114 +#: ../dgit.1:831 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:838 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1500,20 +1509,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:836 +#: ../dgit.1:843 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: =item -#: ../dgit.1:836 ../git-debpush.1.pod:126 +#: ../dgit.1:843 ../git-debpush.1.pod:126 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:845 +#: ../dgit.1:852 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=linear) but if that doesn't seem " @@ -1523,13 +1532,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:845 ../git-debpush.1.pod:120 +#: ../dgit.1:852 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:850 +#: ../dgit.1:857 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1537,7 +1546,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:856 +#: ../dgit.1:863 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1546,13 +1555,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:856 ../git-debpush.1.pod:131 +#: ../dgit.1:863 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:864 +#: ../dgit.1:871 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1561,13 +1570,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:864 +#: ../dgit.1:871 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:869 +#: ../dgit.1:876 msgid "" "Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " "If you use this option and the metadata did in fact need fixing up, dgit " @@ -1575,27 +1584,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:869 +#: ../dgit.1:876 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:876 +#: ../dgit.1:883 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:880 +#: ../dgit.1:887 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:888 +#: ../dgit.1:895 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1604,7 +1613,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:896 +#: ../dgit.1:903 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1612,7 +1621,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:901 +#: ../dgit.1:908 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1620,7 +1629,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:915 +#: ../dgit.1:922 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1632,7 +1641,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:926 +#: ../dgit.1:933 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1643,7 +1652,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:944 +#: ../dgit.1:951 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1657,7 +1666,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:953 +#: ../dgit.1:960 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1669,13 +1678,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:953 +#: ../dgit.1:960 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:962 +#: ../dgit.1:969 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1685,7 +1694,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:968 +#: ../dgit.1:975 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1694,7 +1703,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:973 +#: ../dgit.1:980 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1702,20 +1711,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:973 +#: ../dgit.1:980 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:985 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:986 +#: ../dgit.1:993 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1725,7 +1734,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:992 +#: ../dgit.1:999 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1733,18 +1742,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:995 +#: ../dgit.1:1002 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:998 +#: ../dgit.1:1005 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1006 +#: ../dgit.1:1013 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1752,20 +1761,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1009 +#: ../dgit.1:1016 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1009 +#: ../dgit.1:1016 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1014 +#: ../dgit.1:1021 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1773,7 +1782,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1023 +#: ../dgit.1:1030 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1781,13 +1790,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1023 +#: ../dgit.1:1030 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1031 +#: ../dgit.1:1038 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1796,13 +1805,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1031 +#: ../dgit.1:1038 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1043 +#: ../dgit.1:1050 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1814,32 +1823,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1046 +#: ../dgit.1:1053 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1046 +#: ../dgit.1:1053 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1050 +#: ../dgit.1:1057 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1060 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1062 +#: ../dgit.1:1069 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1848,85 +1857,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1062 +#: ../dgit.1:1069 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1065 +#: ../dgit.1:1072 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1065 +#: ../dgit.1:1072 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1072 +#: ../dgit.1:1079 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1072 +#: ../dgit.1:1079 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1075 +#: ../dgit.1:1082 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1075 +#: ../dgit.1:1082 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1078 +#: ../dgit.1:1085 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1078 +#: ../dgit.1:1085 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1089 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1082 +#: ../dgit.1:1089 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1086 +#: ../dgit.1:1093 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:1086 +#: ../dgit.1:1093 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1095 +#: ../dgit.1:1102 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1936,7 +1945,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1101 +#: ../dgit.1:1108 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1944,30 +1953,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1101 +#: ../dgit.1:1108 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1104 +#: ../dgit.1:1111 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1104 +#: ../dgit.1:1111 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1108 +#: ../dgit.1:1115 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1122 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1975,18 +1984,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1117 +#: ../dgit.1:1124 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1117 +#: ../dgit.1:1124 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1139 +#: ../dgit.1:1146 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1996,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1147 +#: ../dgit.1:1154 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2005,7 +2014,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1152 +#: ../dgit.1:1159 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2013,7 +2022,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1156 +#: ../dgit.1:1163 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2021,39 +2030,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1158 +#: ../dgit.1:1165 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1166 +#: ../dgit.1:1173 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1166 +#: ../dgit.1:1173 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1172 +#: ../dgit.1:1179 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1177 +#: ../dgit.1:1184 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1184 +#: ../dgit.1:1191 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2061,13 +2070,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1184 +#: ../dgit.1:1191 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1207 +#: ../dgit.1:1214 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2077,14 +2086,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1215 +#: ../dgit.1:1222 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1229 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2093,7 +2102,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1233 +#: ../dgit.1:1240 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2103,7 +2112,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1241 +#: ../dgit.1:1248 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2111,7 +2120,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1258 +#: ../dgit.1:1265 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2123,13 +2132,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1258 +#: ../dgit.1:1265 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1268 +#: ../dgit.1:1275 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2140,19 +2149,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1268 +#: ../dgit.1:1275 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1271 +#: ../dgit.1:1278 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1280 +#: ../dgit.1:1287 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2162,13 +2171,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1280 +#: ../dgit.1:1287 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1288 +#: ../dgit.1:1295 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2177,13 +2186,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1288 +#: ../dgit.1:1295 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1295 +#: ../dgit.1:1302 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2191,13 +2200,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1295 +#: ../dgit.1:1302 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1309 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2206,26 +2215,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1302 +#: ../dgit.1:1309 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1307 +#: ../dgit.1:1314 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1307 +#: ../dgit.1:1314 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1313 +#: ../dgit.1:1320 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2233,13 +2242,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1313 +#: ../dgit.1:1320 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1327 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2247,65 +2256,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1327 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1325 +#: ../dgit.1:1332 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1325 +#: ../dgit.1:1332 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1329 +#: ../dgit.1:1336 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1329 +#: ../dgit.1:1336 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1333 +#: ../dgit.1:1340 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1333 +#: ../dgit.1:1340 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1339 +#: ../dgit.1:1346 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1339 +#: ../dgit.1:1346 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1345 +#: ../dgit.1:1352 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2313,13 +2322,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1345 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1352 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1351 +#: ../dgit.1:1358 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2327,31 +2336,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1353 +#: ../dgit.1:1360 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1353 +#: ../dgit.1:1360 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1359 +#: ../dgit.1:1366 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1359 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1366 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1364 +#: ../dgit.1:1371 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2359,73 +2368,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1367 +#: ../dgit.1:1374 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1367 +#: ../dgit.1:1374 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1370 +#: ../dgit.1:1377 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1381 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1381 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1384 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1384 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1382 +#: ../dgit.1:1389 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1389 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1386 +#: ../dgit.1:1393 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1386 +#: ../dgit.1:1393 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1392 +#: ../dgit.1:1399 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2433,45 +2442,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1392 +#: ../dgit.1:1399 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1396 +#: ../dgit.1:1403 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1403 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1398 +#: ../dgit.1:1405 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1402 +#: ../dgit.1:1409 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1409 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1409 +#: ../dgit.1:1416 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2480,52 +2489,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1413 +#: ../dgit.1:1420 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1420 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1415 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1418 +#: ../dgit.1:1425 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1418 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1425 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1421 +#: ../dgit.1:1428 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1421 +#: ../dgit.1:1428 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1426 +#: ../dgit.1:1433 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2533,26 +2542,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1426 +#: ../dgit.1:1433 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1430 +#: ../dgit.1:1437 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1430 +#: ../dgit.1:1437 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1435 +#: ../dgit.1:1442 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2560,13 +2569,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1435 +#: ../dgit.1:1442 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1448 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2574,24 +2583,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1448 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1447 +#: ../dgit.1:1454 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1447 +#: ../dgit.1:1454 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1459 +#: ../dgit.1:1466 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2601,13 +2610,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1459 +#: ../dgit.1:1466 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1464 +#: ../dgit.1:1471 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2616,204 +2625,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1464 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1467 +#: ../dgit.1:1474 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1467 +#: ../dgit.1:1474 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1470 +#: ../dgit.1:1477 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1470 +#: ../dgit.1:1477 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1476 +#: ../dgit.1:1483 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1476 +#: ../dgit.1:1483 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1478 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1480 +#: ../dgit.1:1487 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1482 +#: ../dgit.1:1489 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1484 +#: ../dgit.1:1491 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1486 +#: ../dgit.1:1493 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1488 +#: ../dgit.1:1495 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1490 +#: ../dgit.1:1497 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1492 +#: ../dgit.1:1499 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1494 +#: ../dgit.1:1501 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1496 +#: ../dgit.1:1503 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1498 +#: ../dgit.1:1505 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1500 +#: ../dgit.1:1507 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1502 +#: ../dgit.1:1509 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1504 +#: ../dgit.1:1511 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1506 +#: ../dgit.1:1513 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1508 +#: ../dgit.1:1515 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1510 +#: ../dgit.1:1517 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1512 +#: ../dgit.1:1519 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1514 +#: ../dgit.1:1521 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1516 +#: ../dgit.1:1523 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1518 +#: ../dgit.1:1525 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1520 +#: ../dgit.1:1527 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1522 +#: ../dgit.1:1529 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1524 +#: ../dgit.1:1531 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1526 +#: ../dgit.1:1533 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1534 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1536 +#: ../dgit.1:1543 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2823,26 +2832,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1536 +#: ../dgit.1:1543 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1540 +#: ../dgit.1:1547 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1540 +#: ../dgit.1:1547 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1545 +#: ../dgit.1:1552 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2850,13 +2859,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1545 +#: ../dgit.1:1552 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1559 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2864,7 +2873,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1558 +#: ../dgit.1:1565 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2872,7 +2881,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1563 +#: ../dgit.1:1570 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2881,7 +2890,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1568 +#: ../dgit.1:1575 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2889,25 +2898,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1577 +#: ../dgit.1:1584 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1578 +#: ../dgit.1:1585 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index af63d4e..46aa9f4 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-08-10 19:42+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,19 +28,19 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:476 +#: ../dgit.1:496 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:254 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -293,26 +293,26 @@ msgstr "" #: ../git-debrebase.1.pod:131 msgid "" "Throws away all the work since the branch was last stitched. This is done " -"by rewinding you to ffq-prev." +"by resetting you to ffq-prev and discarding all working tree changes." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:134 +#: ../git-debrebase.1.pod:135 msgid "If you are in the middle of a git-rebase, will abort that too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:136 +#: ../git-debrebase.1.pod:137 msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:138 +#: ../git-debrebase.1.pod:139 msgid "Rebases the delta queue onto a new upstream version. In detail:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:141 +#: ../git-debrebase.1.pod:142 msgid "" "Firstly, checks that the proposed rebase seems to make sense: It is a snag " "unless the new upstream(s) are fast forward from the previous upstream(s) " @@ -322,12 +322,12 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:149 +#: ../git-debrebase.1.pod:150 msgid "If all seems well, unstitches and launders the branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:151 +#: ../git-debrebase.1.pod:152 msgid "" "Then, generates (in a private working area) a new anchor merge commit, on " "top of the breakwater tip, and on top of that a commit to update the version " @@ -335,26 +335,26 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:159 +#: ../git-debrebase.1.pod:160 msgid "Finally, starts a git-rebase of the delta queue onto these new commits." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:163 +#: ../git-debrebase.1.pod:164 msgid "" "That git-rebase may complete successfully, or it may require your " "assistance, just like a normal git-rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:167 +#: ../git-debrebase.1.pod:168 msgid "" "If you git-rebase --abort, the whole new upstream operation is aborted, " "except for the laundering." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:171 +#: ../git-debrebase.1.pod:172 msgid "" "<new-version> may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " @@ -362,17 +362,17 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:177 +#: ../git-debrebase.1.pod:178 msgid "The <upstream-details> are, optionally, in order:" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:181 +#: ../git-debrebase.1.pod:182 msgid "<upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:183 +#: ../git-debrebase.1.pod:184 msgid "" "The new upstream branch (or commit-ish). The default is to look for one of " "these tags, in this order: U vU upstream/U; where U is the new upstream " @@ -380,7 +380,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:189 +#: ../git-debrebase.1.pod:190 msgid "" "It is a snag if the upstream contains a debian/ directory; if forced to " "proceed, git-debrebase will disregard the upstream's debian/ and take (only) " @@ -388,17 +388,17 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:194 +#: ../git-debrebase.1.pod:195 msgid "<piece-name> <piece-upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:196 +#: ../git-debrebase.1.pod:197 msgid "Specifies that this is a multi-piece upstream. May be repeated." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:199 +#: ../git-debrebase.1.pod:200 msgid "" "When such a pair is specified, git-debrebase will first combine the pieces " "of the upstream together, and then use the result as the combined new " @@ -406,7 +406,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:204 +#: ../git-debrebase.1.pod:205 msgid "" "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes " "the subdirectory <piece-name> in the combined new upstream (supplanting any " @@ -414,14 +414,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:211 +#: ../git-debrebase.1.pod:212 msgid "" "<piece-name> has a restricted syntax: it may contain only ASCII " "alphanumerics and hyphens." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:214 +#: ../git-debrebase.1.pod:215 msgid "" "The combined upstream is itself recorded as a commit, with each of the " "upstream pieces' commits as parents. The combined commit contains an " @@ -430,24 +430,24 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:220 +#: ../git-debrebase.1.pod:221 msgid "<git-rebase options>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:222 +#: ../git-debrebase.1.pod:223 msgid "These will be passed to git rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:224 +#: ../git-debrebase.1.pod:225 msgid "" "If the upstream rebase is troublesome, -i may be helpful. As with plain git-" "debrebase, do not specify a base, or --onto, or --fork-point." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:230 +#: ../git-debrebase.1.pod:231 msgid "" "If you are planning to generate a .dsc, you will also need to have, or " "generate, actual orig tarball(s), which must be identical to the rev-" @@ -458,19 +458,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:241 +#: ../git-debrebase.1.pod:242 msgid "git-debrebase make-patches [--quiet-would-amend]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:243 +#: ../git-debrebase.1.pod:244 msgid "" "Generate patches in debian/patches/ representing the changes made to " "upstream files." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:246 +#: ../git-debrebase.1.pod:247 msgid "" "It is not normally necessary to run this command explicitly. When uploading " "to Debian, dgit and git-debrebase will cooperate to regenerate patches as " @@ -478,7 +478,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:253 +#: ../git-debrebase.1.pod:254 msgid "" "Normally git-debrebase make-patches will require a laundered branch. (A " "laundered branch does not contain any patches.) But if there are already " @@ -488,7 +488,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:262 +#: ../git-debrebase.1.pod:263 msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " @@ -498,53 +498,53 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:271 +#: ../git-debrebase.1.pod:272 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:273 +#: ../git-debrebase.1.pod:274 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:275 +#: ../git-debrebase.1.pod:276 msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:281 +#: ../git-debrebase.1.pod:282 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:285 +#: ../git-debrebase.1.pod:286 msgid "" "a patches-unapplied git packaging branch containing debian/patches, as used " "with quilt" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:290 +#: ../git-debrebase.1.pod:291 msgid "" "a git branch for a package which has no Debian delta - ie where upstream " "files are have not been modified in Debian, so there are no patches" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:296 +#: ../git-debrebase.1.pod:297 msgid "(These two commands operate identically and are simply aliases.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:298 +#: ../git-debrebase.1.pod:299 msgid "" "The conversion is done by generating a new anchor merge, converting any " "quilt patches as a delta queue, and dropping the patches from the tree." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:302 +#: ../git-debrebase.1.pod:303 msgid "" "The upstream commit-ish should correspond to the upstream branch or tag, if " "there is one. It is a snag if it is not an ancestor of HEAD, or if the " @@ -554,7 +554,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:310 +#: ../git-debrebase.1.pod:311 msgid "" "It is also a snag if the specified upstream has a debian/ subdirectory. " "This check exists to detect certain likely user errors, but if this " @@ -562,7 +562,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:316 +#: ../git-debrebase.1.pod:317 msgid "" "git-debrebase will try to look for the dgit archive view of the most recent " "release, and if it finds it will make a pseduomerge so that your new git-" @@ -570,14 +570,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:321 +#: ../git-debrebase.1.pod:322 msgid "" "The result is a well-formed git-debrebase interchange branch. The result is " "also fast-forward from the original branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:324 +#: ../git-debrebase.1.pod:325 msgid "" "It is a snag if the new branch looks like it will have diverged, just as for " "a laundering/unstitching call to git-debrebase; See L</Establish the current " @@ -585,7 +585,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:328 +#: ../git-debrebase.1.pod:329 msgid "" "Note that it is dangerous not to know whether you are dealing with a (gbp) " "patches-unapplied branch containing quilt patches, or a git-debrebase " @@ -594,39 +594,39 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:337 +#: ../git-debrebase.1.pod:338 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:341 +#: ../git-debrebase.1.pod:342 msgid "git-debrebase breakwater" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:343 +#: ../git-debrebase.1.pod:344 msgid "" "Prints the breakwater tip commitid. If your HEAD branch is not fully " "laundered, prints the tip of the so-far-laundered breakwater." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:347 +#: ../git-debrebase.1.pod:348 msgid "git-debrebase anchor" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:349 +#: ../git-debrebase.1.pod:350 msgid "Prints the breakwater anchor commitid." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:351 +#: ../git-debrebase.1.pod:352 msgid "git-debrebase analyse" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:353 +#: ../git-debrebase.1.pod:354 msgid "" "Walks the history of the current branch, most recent commit first, back " "until the most recent anchor, printing the commit object id, and commit type " @@ -634,31 +634,31 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:361 +#: ../git-debrebase.1.pod:362 msgid "git-debrebase record-ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:363 +#: ../git-debrebase.1.pod:364 msgid "" "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING " "AND LAUNDERING>, but does not launder the branch or move HEAD." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:367 +#: ../git-debrebase.1.pod:368 msgid "" "It is an error if the ffq-prev could not be recorded. It is also an error " "if an ffq-prev has already been recorded, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:371 +#: ../git-debrebase.1.pod:372 msgid "git-debrebase launder-v0" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:373 +#: ../git-debrebase.1.pod:374 msgid "" "Launders the branch without recording anything in ffq-prev. Then prints " "some information about the current branch. Do not use this operation; it " @@ -666,12 +666,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:378 +#: ../git-debrebase.1.pod:379 msgid "git-debrebase convert-to-gbp" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:380 +#: ../git-debrebase.1.pod:381 msgid "" "Converts a laundered branch into a gbp patches-unapplied branch containing " "quilt patches. The result is not fast forward from the interchange branch, " @@ -679,7 +679,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:385 +#: ../git-debrebase.1.pod:386 msgid "" "This is provided mostly for the test suite and for unusual situations. It " "should only be used with care and with a proper understanding of the " @@ -687,19 +687,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:390 +#: ../git-debrebase.1.pod:391 msgid "" "Be sure to not accidentally treat the result as a git-debrebase branch, or " "you will drop all the patches!" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:394 +#: ../git-debrebase.1.pod:395 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:396 +#: ../git-debrebase.1.pod:397 msgid "" "Converts any dgit-compatible git branch corresponding to a (possibly " "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " @@ -707,7 +707,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:400 +#: ../git-debrebase.1.pod:401 msgid "" "This operation should not be used if the branch is already in git-debrebase " "form. Normally git-debrebase will refuse to continue in this case (or " @@ -715,7 +715,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:405 +#: ../git-debrebase.1.pod:406 msgid "" "Some representation of the original upstream source code will be needed. If " "I<upstream> is supplied, that must be a suitable upstream commit. By " @@ -724,7 +724,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:411 +#: ../git-debrebase.1.pod:412 msgid "" "The upstream source must be exactly right and all the patches in debian/" "patches must be up to date. Applying the patches from debian/patches to the " @@ -732,7 +732,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:416 +#: ../git-debrebase.1.pod:417 msgid "" "The output is laundered and stitched. The resulting history is not " "particularly pretty, especially if orig tarball(s) were imported to produce " @@ -740,31 +740,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:421 +#: ../git-debrebase.1.pod:422 msgid "" "The available convert-options are as follows. (These must come after " "convert-from-dgit-view.)" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:426 +#: ../git-debrebase.1.pod:427 msgid "--[no-]diagnose" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:428 +#: ../git-debrebase.1.pod:429 msgid "" "Print additional error messages to help diagnose failure to find an " "appropriate upstream. --no-diagnose is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:432 +#: ../git-debrebase.1.pod:433 msgid "--build-products-dir" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:434 +#: ../git-debrebase.1.pod:435 msgid "" "Directory to look in for orig tarballs. The default is the git config " "option dgit.default.build-products-dir or failing that, C<..>. Passed on to " @@ -772,35 +772,35 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:440 +#: ../git-debrebase.1.pod:441 msgid "--[no-]origs" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:442 +#: ../git-debrebase.1.pod:443 msgid "" "Whether to try to look for or use any orig tarballs. --origs is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:445 +#: ../git-debrebase.1.pod:446 msgid "--[no-]tags" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:447 +#: ../git-debrebase.1.pod:448 msgid "" "Whether to try to look for or use any upstream git tags. --tags is the " "default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:450 +#: ../git-debrebase.1.pod:451 msgid "--always-convert-anyway" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:452 +#: ../git-debrebase.1.pod:453 msgid "" "Perform the conversion operation, producing unpleasant extra history, even " "if the branch seems to be in git-debrebase form already. This should not be " @@ -808,12 +808,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:460 +#: ../git-debrebase.1.pod:461 msgid "git-debrebase forget-was-ever-debrebase" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:462 +#: ../git-debrebase.1.pod:463 msgid "" "Deletes the ffq-prev and debrebase-last refs associated with this branch, " "that git-debrebase and dgit use to determine whether this branch is managed " @@ -821,19 +821,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:468 +#: ../git-debrebase.1.pod:469 msgid "" "This can be useful if you were just playing with git-debrebase, and have " "used git-reset --hard to go back to a commit before your experiments." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:472 +#: ../git-debrebase.1.pod:473 msgid "Do not use this if you expect to run git-debrebase on the branch again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:478 +#: ../git-debrebase.1.pod:479 msgid "" "This section documents the general options to git-debrebase (ie, the ones " "which immediately follow git-debrebase or git debrebase on the command " @@ -842,78 +842,78 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:490 +#: ../git-debrebase.1.pod:491 msgid "-f<snag-id>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:492 +#: ../git-debrebase.1.pod:493 msgid "Turns snag(s) with id <snag-id> into warnings." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:494 +#: ../git-debrebase.1.pod:495 msgid "" "Some troublesome things which git-debrebase encounters are B<snag>s. (The " "specific instances are discussed in the text for the relevant operation.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:499 +#: ../git-debrebase.1.pod:500 msgid "" "When a snag is detected, a message is printed to stderr containing the snag " "id (in the form C<-f<snag-idE<gt>>), along with some prose." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:504 +#: ../git-debrebase.1.pod:505 msgid "" "If snags are detected, git-debrebase does not continue, unless the relevant -" "f<snag-id> is specified, or --force is specified." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:508 +#: ../git-debrebase.1.pod:509 msgid "--force" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:510 +#: ../git-debrebase.1.pod:511 msgid "Turns all snags into warnings. See the -f<snag-id> option." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:513 +#: ../git-debrebase.1.pod:514 msgid "" "Do not invoke git-debrebase --force in scripts and aliases; instead, specify " "the particular -f<snag-id> for expected snags." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:516 +#: ../git-debrebase.1.pod:517 msgid "--noop-ok" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:518 +#: ../git-debrebase.1.pod:519 msgid "" "Suppresses the error in some situations where git-debrebase does nothing, " "because there is nothing to do." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:522 +#: ../git-debrebase.1.pod:523 msgid "" "The specific instances are discussed in the text for the relvant operation." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:525 +#: ../git-debrebase.1.pod:526 msgid "--anchor=<commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:527 +#: ../git-debrebase.1.pod:528 msgid "" "Treats <commit-ish> as an anchor. This overrides the usual logic which " "automatically classifies commits as anchors, pseudomerges, delta queue " @@ -921,7 +921,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:531 +#: ../git-debrebase.1.pod:532 msgid "" "It also disables some coherency checks which depend on metadata extracted " "from its commit message, so it is a snag if <commit-ish> is the anchor for " @@ -929,41 +929,41 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:538 +#: ../git-debrebase.1.pod:539 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:540 +#: ../git-debrebase.1.pod:541 msgid "" "Run <program>, instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:544 +#: ../git-debrebase.1.pod:545 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:546 +#: ../git-debrebase.1.pod:547 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:548 +#: ../git-debrebase.1.pod:549 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:550 +#: ../git-debrebase.1.pod:551 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:553 +#: ../git-debrebase.1.pod:554 msgid "" "This option may generate lossage of various kinds, including misleading " "error messages, references to nonexistent documentation, and you being " @@ -971,24 +971,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:561 +#: ../git-debrebase.1.pod:562 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:563 +#: ../git-debrebase.1.pod:564 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:566 +#: ../git-debrebase.1.pod:567 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:568 +#: ../git-debrebase.1.pod:569 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -996,30 +996,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:580 +#: ../git-debrebase.1.pod:581 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:585 +#: ../git-debrebase.1.pod:586 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:590 +#: ../git-debrebase.1.pod:591 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:595 +#: ../git-debrebase.1.pod:596 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:600 +#: ../git-debrebase.1.pod:601 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1027,7 +1027,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:605 +#: ../git-debrebase.1.pod:606 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -1036,31 +1036,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:611 +#: ../git-debrebase.1.pod:612 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:615 +#: ../git-debrebase.1.pod:616 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:617 +#: ../git-debrebase.1.pod:618 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:622 +#: ../git-debrebase.1.pod:623 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:624 +#: ../git-debrebase.1.pod:625 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1068,13 +1068,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:630 +#: ../git-debrebase.1.pod:631 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:635 +#: ../git-debrebase.1.pod:636 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" |