diff options
Diffstat (limited to 'po/messages.pot')
| -rw-r--r-- | po/messages.pot | 990 |
1 files changed, 579 insertions, 411 deletions
diff --git a/po/messages.pot b/po/messages.pot index f81c3ef..79e2872 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 11:56+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:268 +#: ../dgit:270 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:275 +#: ../dgit:277 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:283 +#: ../dgit:285 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:288 +#: ../dgit:290 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:520 +#: ../dgit:544 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:525 ../dgit:531 +#: ../dgit:549 ../dgit:555 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:526 +#: ../dgit:550 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:534 +#: ../dgit:558 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:541 +#: ../dgit:565 msgid "protocol message" msgstr "" -#: ../dgit:549 +#: ../dgit:573 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:570 +#: ../dgit:594 msgid "bad byte count" msgstr "" -#: ../dgit:573 +#: ../dgit:597 msgid "data block" msgstr "" -#: ../dgit:652 +#: ../dgit:676 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:654 +#: ../dgit:678 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:679 +#: ../dgit:703 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:698 +#: ../dgit:722 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:702 +#: ../dgit:726 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:707 +#: ../dgit:731 msgid "too few arguments" msgstr "" -#: ../dgit:823 +#: ../dgit:850 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:826 +#: ../dgit:853 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:846 +#: ../dgit:873 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:903 +#: ../dgit:930 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:918 +#: ../dgit:945 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:934 +#: ../dgit:961 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:954 +#: ../dgit:981 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:972 +#: ../dgit:999 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:1004 ../git-debrebase:1548 ../Debian/Dgit.pm:212 msgid "internal error" msgstr "" -#: ../dgit:979 +#: ../dgit:1006 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:983 +#: ../dgit:1010 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1006 +#: ../dgit:1033 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1169 +#: ../dgit:1196 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1237 +#: ../dgit:1264 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1244 +#: ../dgit:1271 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1265 +#: ../dgit:1292 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1283 +#: ../dgit:1310 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1287 +#: ../dgit:1314 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1316 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1291 +#: ../dgit:1318 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1320 ../dgit:1345 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1307 +#: ../dgit:1334 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1309 +#: ../dgit:1336 msgid "bad component" msgstr "" -#: ../dgit:1312 +#: ../dgit:1339 msgid "bad filename" msgstr "" -#: ../dgit:1314 +#: ../dgit:1341 msgid "bad sha256sum" msgstr "" -#: ../dgit:1365 +#: ../dgit:1392 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1449 +#: ../dgit:1476 #, 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:1473 +#: ../dgit:1500 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1499 +#: ../dgit:1526 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1500 +#: ../dgit:1527 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1605 +#: ../dgit:1632 #, 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:1744 +#: ../dgit:1771 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1747 +#: ../dgit:1774 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1776 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1769 +#: ../dgit:1796 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1775 +#: ../dgit:1802 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1802 +#: ../dgit:1829 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1825 +#: ../dgit:1852 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1867 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1877 +#: ../dgit:1904 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1923 +#: ../dgit:1950 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1934 +#: ../dgit:1961 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1980 +#: ../dgit:2007 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1989 +#: ../dgit:2016 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1993 +#: ../dgit:2020 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1999 +#: ../dgit:2026 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2039 +#: ../dgit:2069 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2052 +#: ../dgit:2081 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2065 +#: ../dgit:2094 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2081 +#: ../dgit:2110 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2086 +#: ../dgit:2115 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2094 +#: ../dgit:2123 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2101 +#: ../dgit:2130 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2129 +#: ../dgit:2158 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2137 +#: ../dgit:2166 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2140 +#: ../dgit:2169 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2159 +#: ../dgit:2188 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2182 +#: ../dgit:2211 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,122 @@ msgid "" "\n" msgstr "" -#: ../dgit:2194 +#: ../dgit:2223 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2225 +#: ../dgit:2254 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2227 +#: ../dgit:2256 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2229 +#: ../dgit:2258 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2234 +#: ../dgit:2263 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2259 +#: ../dgit:2301 +#, perl-format +msgid "%s: multiple representations of similar orig %s:\n" +msgstr "" + +#: ../dgit:2305 +#, perl-format +msgid " %s: in %s (%s)\n" +msgstr "" + +#: ../dgit:2310 +msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." +msgstr "" + +#: ../dgit:2327 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2263 +#: ../dgit:2331 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2265 +#: ../dgit:2333 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2268 +#: ../dgit:2336 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2277 +#: ../dgit:2345 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2281 +#: ../dgit:2349 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2284 +#: ../dgit:2352 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2290 +#: ../dgit:2358 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2361 +#: ../dgit:2429 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2423 +#: ../dgit:2491 msgid "package changelog" msgstr "" -#: ../dgit:2463 +#: ../dgit:2531 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2532 ../dgit:2537 +#: ../dgit:2600 ../dgit:2605 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2552 ../dgit:2559 +#: ../dgit:2622 ../dgit:2629 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2585 ../dgit:6078 +#: ../dgit:2655 ../dgit:6433 msgid "source package" msgstr "" -#: ../dgit:2665 +#: ../dgit:2735 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2684 +#: ../dgit:2755 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2693 +#: ../dgit:2765 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +543,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2713 +#: ../dgit:2785 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2717 +#: ../dgit:2789 msgid "Import of source package" msgstr "" -#: ../dgit:2737 +#: ../dgit:2809 #, perl-format msgid "" "\n" @@ -547,51 +561,52 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2779 +#: ../dgit:2851 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2783 +#: ../dgit:2855 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2787 +#: ../dgit:2859 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2803 +#: ../dgit:2875 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2898 +#: ../dgit:2970 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2913 +#: ../dgit:2985 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2957 +#: ../dgit:3029 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2972 +#: ../dgit:3044 +#, perl-format 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" +"or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:2977 +#: ../dgit:3049 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +616,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3124 +#: ../dgit:3196 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3129 +#: ../dgit:3201 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3134 +#: ../dgit:3206 #, 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:3144 +#: ../dgit:3216 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +642,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3164 +#: ../dgit:3236 msgid "rewrite map" msgstr "" -#: ../dgit:3171 +#: ../dgit:3243 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3175 +#: ../dgit:3247 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3177 +#: ../dgit:3249 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3184 +#: ../dgit:3256 msgid "additional commits" msgstr "" -#: ../dgit:3187 +#: ../dgit:3259 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3212 +#: ../dgit:3284 msgid "last upload to archive" msgstr "" -#: ../dgit:3216 +#: ../dgit:3288 msgid "no version available from the archive" msgstr "" -#: ../dgit:3299 +#: ../dgit:3371 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3306 +#: ../dgit:3378 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3311 +#: ../dgit:3383 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3339 +#: ../dgit:3411 #, perl-format msgid "" "\n" @@ -684,15 +699,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3352 +#: ../dgit:3424 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3355 +#: ../dgit:3427 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3376 +#: ../dgit:3448 #, perl-format msgid "" "\n" @@ -700,7 +715,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3385 +#: ../dgit:3457 #, perl-format msgid "" "\n" @@ -710,7 +725,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3470 +#: ../dgit:3542 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +733,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3483 +#: ../dgit:3555 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3501 +#: ../dgit:3573 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3503 +#: ../dgit:3575 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3514 +#: ../dgit:3586 #, perl-format msgid "" "\n" @@ -740,30 +755,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3529 +#: ../dgit:3601 msgid "fetched source tree" msgstr "" -#: ../dgit:3565 +#: ../dgit:3637 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3630 +#: ../dgit:3702 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3644 +#: ../dgit:3716 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3659 +#: ../dgit:3731 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3686 +#: ../dgit:3758 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +786,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3708 +#: ../dgit:3780 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3716 +#: ../dgit:3788 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3755 +#: ../dgit:3827 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3787 +#: ../dgit:3859 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3789 +#: ../dgit:3861 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3828 +#: ../dgit:3900 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +817,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3842 +#: ../dgit:3914 msgid "" "\n" "Key\n" @@ -811,257 +826,341 @@ msgid "" "\n" msgstr "" -#: ../dgit:3857 +#: ../dgit:3929 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3875 +#: ../dgit:3947 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3893 +#: ../dgit:3965 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3908 +#: ../dgit:3980 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3920 +#: ../dgit:3992 msgid "fetching existing git history" msgstr "" -#: ../dgit:3923 +#: ../dgit:3995 msgid "starting new git history" msgstr "" -#: ../dgit:3948 +#: ../dgit:4020 #, 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:3953 +#: ../dgit:4025 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3965 +#: ../dgit:4037 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3967 +#: ../dgit:4039 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3975 +#: ../dgit:4047 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3986 +#: ../dgit:4058 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4005 +#: ../dgit:4077 #, 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:4022 +#: ../dgit:4094 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4025 +#: ../dgit:4097 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4029 +#: ../dgit:4101 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4073 +#: ../dgit:4145 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4078 +#: ../dgit:4150 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4088 +#: ../dgit:4160 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4094 +#: ../dgit:4166 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4120 +#: ../dgit:4192 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4123 +#: ../dgit:4195 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4203 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4140 +#: ../dgit:4212 msgid "version currently in archive" msgstr "" -#: ../dgit:4149 +#: ../dgit:4221 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4157 +#: ../dgit:4230 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4168 +#: ../dgit:4241 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4171 +#: ../dgit:4244 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4185 +#: ../dgit:4249 +#, perl-format +msgid "" +"d/changelog entry for %s is unfinalised!\n" +"Your tree seems to based on earlier (not uploaded) %s.\n" +msgstr "" + +#: ../dgit:4263 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4241 +#: ../dgit:4319 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4250 +#: ../dgit:4328 msgid "maintainer view tag" msgstr "" -#: ../dgit:4252 +#: ../dgit:4330 msgid "dgit view tag" msgstr "" -#: ../dgit:4253 +#: ../dgit:4331 msgid "current archive contents" msgstr "" -#: ../dgit:4266 +#: ../dgit:4344 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4276 +#: ../dgit:4354 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4277 +#: ../dgit:4355 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4281 +#: ../dgit:4359 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4294 +#: ../dgit:4372 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4302 +#: ../dgit:4380 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4314 +#: ../dgit:4392 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4336 +#: ../dgit:4414 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4390 +#: ../dgit:4468 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5650 +#: ../dgit:5701 +#, perl-format +msgid "dgit: cannot represent change: %s: %s\n" +msgstr "" + +#: ../dgit:5706 +msgid "" +"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" +msgstr "" + +#: ../dgit:5744 +#, perl-format +msgid "" +"\n" +"For full diff showing the problem(s), type:\n" +" %s\n" +msgstr "" + +#: ../dgit:5751 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-unapplied git tree\n" +" but git tree differs from orig in upstream files." +msgstr "" + +#: ../dgit:5757 +msgid "" +"\n" +" ... debian/patches is missing; perhaps this is a patch queue branch?" +msgstr "" + +#: ../dgit:5764 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-applied git tree\n" +" but git tree differs from result of applying debian/patches to upstream\n" +msgstr "" + +#: ../dgit:5778 +#, perl-format +msgid "Combine debian/ with upstream source for %s\n" +msgstr "" + +#: ../dgit:5786 +msgid "dgit view: creating patches-applied version using gbp pq" +msgstr "" + +#: ../dgit:5797 +#, perl-format +msgid "" +"--quilt=%s specified, implying that HEAD is for use with a\n" +" tool which does not create patches for changes to upstream\n" +" .gitignores: but, such patches exist in debian/patches.\n" +msgstr "" + +#: ../dgit:5805 +msgid "dgit view: creating patch to represent .gitignore changes" +msgstr "" + +#: ../dgit:5810 +#, perl-format +msgid "%s already exists; but want to create it to record .gitignore changes" +msgstr "" + +#: ../dgit:5815 +msgid "" +"Subject: Update .gitignore from Debian packaging branch\n" +"\n" +"The Debian packaging git branch contains these updates to the upstream\n" +".gitignore file(s). This patch is autogenerated, to provide these\n" +"updates to users of the official Debian archive view of the package.\n" +msgstr "" + +#: ../dgit:5837 +msgid "Commit patch to update .gitignore\n" +msgstr "" + +#: ../dgit:5907 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5668 +#: ../dgit:5925 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5677 +#: ../dgit:5934 msgid "root commit" msgstr "" -#: ../dgit:5683 +#: ../dgit:5940 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5695 +#: ../dgit:5952 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5714 +#: ../dgit:5971 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5721 +#: ../dgit:5978 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5733 +#: ../dgit:5990 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5736 +#: ../dgit:5993 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5748 +#: ../dgit:6007 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1168,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:5755 +#: ../dgit:6014 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5789 +#: ../dgit:6048 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5790 +#: ../dgit:6049 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5791 +#: ../dgit:6050 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5792 +#: ../dgit:6051 msgid "is series file\n" msgstr "" -#: ../dgit:5793 +#: ../dgit:6052 msgid "too long\n" msgstr "" -#: ../dgit:5797 +#: ../dgit:6056 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5826 +#: ../dgit:6085 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5909 +#: ../dgit:6160 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5927 +#: ../dgit:6185 msgid "converted" msgstr "" -#: ../dgit:5928 +#: ../dgit:6186 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5982 +#: ../dgit:6240 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5992 +#: ../dgit:6250 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6102 +#: ../dgit:6286 +#, perl-format +msgid "regenerating patch using git diff (--quilt=%s)" +msgstr "" + +#: ../dgit:6367 +msgid "" +"warning: package uses dpkg-source include-binaries feature - not all changes " +"are visible in patches!\n" +msgstr "" + +#: ../dgit:6376 +#, perl-format +msgid "warning: ignoring bad include-binaries file %s: %s\n" +msgstr "" + +#: ../dgit:6379 +#, perl-format +msgid "forbidden path component '%s'" +msgstr "" + +#: ../dgit:6389 +#, perl-format +msgid "path starts with '%s'" +msgstr "" + +#: ../dgit:6399 +#, perl-format +msgid "path to '%s' not a plain file or directory" +msgstr "" + +#: ../dgit:6457 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6134 +#: ../dgit:6489 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6139 +#: ../dgit:6494 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6174 +#: ../dgit:6529 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6288 +#: ../dgit:6622 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 +1284,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6302 -msgid "Tree already contains .pc - will use it then delete it." +#: ../dgit:6636 +msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6336 +#: ../dgit:6670 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6349 +#: ../dgit:6683 msgid "tarball" msgstr "" -#: ../dgit:6367 +#: ../dgit:6701 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6383 +#: ../dgit:6717 msgid "tarballs" msgstr "" -#: ../dgit:6397 +#: ../dgit:6731 msgid "upstream" msgstr "" -#: ../dgit:6421 +#: ../dgit:6755 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6431 +#: ../dgit:6765 #, 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:6440 -#, perl-format -msgid "dgit: cannot represent change: %s: %s\n" -msgstr "" - -#: ../dgit:6444 -msgid "" -"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" -msgstr "" - -#: ../dgit:6451 +#: ../dgit:6775 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6455 +#: ../dgit:6779 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6458 +#: ../dgit:6782 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6461 +#: ../dgit:6785 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6464 +#: ../dgit:6788 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6468 +#: ../dgit:6792 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6479 +#: ../dgit:6803 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6518 +#: ../dgit:6842 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,82 +1360,83 @@ msgid "" "\n" msgstr "" -#: ../dgit:6530 +#: ../dgit:6854 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6559 +#: ../dgit:6883 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:6571 +#: ../dgit:6895 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6574 +#: ../dgit:6898 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6577 +#: ../dgit:6901 msgid "" "tree contains uncommited, untracked, unignored files\n" -"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" +"To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:6590 +#: ../dgit:6915 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6607 +#: ../dgit:6932 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6621 +#: ../dgit:6946 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6640 +#: ../dgit:6965 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6650 +#: ../dgit:6975 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6659 +#: ../dgit:6984 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6663 +#: ../dgit:6988 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6698 +#: ../dgit:7023 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6700 +#: ../dgit:7025 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6718 +#: ../dgit:7043 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:6725 +#: ../dgit:7050 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1323,54 +1444,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:6751 +#: ../dgit:7076 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6757 +#: ../dgit:7082 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6760 +#: ../dgit:7085 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6803 +#: ../dgit:7128 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6841 +#: ../dgit:7166 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6848 +#: ../dgit:7173 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6855 +#: ../dgit:7180 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6859 +#: ../dgit:7184 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:7189 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6867 +#: ../dgit:7192 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6880 +#: ../dgit:7205 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1378,136 +1499,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6898 +#: ../dgit:7223 msgid "build successful\n" msgstr "" -#: ../dgit:6906 +#: ../dgit:7231 #, 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:7017 +#: ../dgit:7342 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7054 +#: ../dgit:7387 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7074 +#: ../dgit:7413 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7087 +#: ../dgit:7426 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7091 +#: ../dgit:7430 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7098 +#: ../dgit:7437 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7104 +#: ../dgit:7443 msgid "source changes file" msgstr "" -#: ../dgit:7106 +#: ../dgit:7445 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7126 ../dgit:7128 +#: ../dgit:7465 ../dgit:7467 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7142 +#: ../dgit:7481 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:7155 +#: ../dgit:7494 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7159 +#: ../dgit:7498 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:7189 +#: ../dgit:7528 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7210 +#: ../dgit:7549 msgid "source tree" msgstr "" -#: ../dgit:7212 +#: ../dgit:7551 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7225 +#: ../dgit:7564 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7229 +#: ../dgit:7568 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7233 +#: ../dgit:7572 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7250 +#: ../dgit:7589 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7255 +#: ../dgit:7594 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7257 +#: ../dgit:7596 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7268 +#: ../dgit:7607 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7271 +#: ../dgit:7610 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7282 +#: ../dgit:7621 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7293 +#: ../dgit:7632 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7302 +#: ../dgit:7641 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1515,21 +1636,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7309 +#: ../dgit:7648 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7311 +#: ../dgit:7650 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7316 +#: ../dgit:7655 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7321 +#: ../dgit:7660 #, perl-format msgid "" "Branch %s already exists\n" @@ -1537,129 +1658,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7341 +#: ../dgit:7680 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7343 +#: ../dgit:7682 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7351 +#: ../dgit:7690 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7370 +#: ../dgit:7709 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7374 +#: ../dgit:7713 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7375 +#: ../dgit:7714 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7386 +#: ../dgit:7725 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7388 +#: ../dgit:7727 msgid "Import, merging." msgstr "" -#: ../dgit:7402 +#: ../dgit:7741 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7411 +#: ../dgit:7750 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7418 +#: ../dgit:7757 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7436 +#: ../dgit:7775 msgid "need destination argument" msgstr "" -#: ../dgit:7441 +#: ../dgit:7780 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7449 +#: ../dgit:7788 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7460 +#: ../dgit:7799 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7466 +#: ../dgit:7805 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7473 ../dgit:7479 +#: ../dgit:7812 ../dgit:7818 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7485 +#: ../dgit:7824 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7532 +#: ../dgit:7871 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7571 +#: ../dgit:7910 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7575 +#: ../dgit:7914 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7675 +#: ../dgit:8014 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7693 +#: ../dgit:8032 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7748 +#: ../dgit:8087 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7763 +#: ../dgit:8102 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7767 +#: ../dgit:8106 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7773 +#: ../dgit:8112 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1667,35 +1788,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:8129 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7803 +#: ../dgit:8142 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7823 +#: ../dgit:8162 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7834 +#: ../dgit:8174 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7862 +#: ../dgit:8202 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7863 +#: ../dgit:8203 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7882 +#: ../dgit:8223 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2190,15 +2311,15 @@ msgstr "" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2475 +#: ../git-debrebase:2476 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2480 +#: ../git-debrebase:2481 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2496 +#: ../git-debrebase:2497 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2206,58 +2327,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2504 +#: ../git-debrebase:2505 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2511 +#: ../git-debrebase:2512 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2514 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2520 +#: ../git-debrebase:2521 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2538 +#: ../git-debrebase:2539 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2544 +#: ../git-debrebase:2545 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2548 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2550 +#: ../git-debrebase:2551 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2552 +#: ../git-debrebase:2553 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2554 +#: ../git-debrebase:2555 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2561 +#: ../git-debrebase:2562 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2265,12 +2386,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2607 +#: ../git-debrebase:2608 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2636 +#: ../git-debrebase:2637 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2278,16 +2399,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2657 +#: ../git-debrebase:2658 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2665 +#: ../git-debrebase:2666 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2679 +#: ../git-debrebase:2680 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2295,175 +2416,190 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2683 +#: ../git-debrebase:2684 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2695 +#: ../git-debrebase:2696 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2704 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2708 +#: ../git-debrebase:2710 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2717 +#: ../git-debrebase:2719 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2725 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2754 +#: ../git-debrebase:2756 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2763 +#: ../git-debrebase:2765 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2800 +#: ../git-debrebase:2806 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2809 +#: ../git-debrebase:2815 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2823 +#: ../git-debrebase:2829 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2835 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2836 +#: ../git-debrebase:2840 +#, perl-format +msgid "" +"Result of applying debian/patches/ onto the upstream is not the same as " +"HEAD.\n" +"(Applying patches gave the commit %s)\n" +"Perhaps the upstream is not right, or not all of the delta is in d/patches.\n" +msgstr "" + +#: ../git-debrebase:2848 +msgid "Output of conversion does not match input!" +msgstr "" + +#: ../git-debrebase:2856 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2840 +#: ../git-debrebase:2860 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2942 +#: ../git-debrebase:2962 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2952 +#: ../git-debrebase:2972 #, perl-format -msgid "%s: no cuddling to -i for git-rebase" +msgid "" +"%s: with git-debrebase, get-rebase -i option may only be followed by more " +"options (as separate arguments)" msgstr "" -#: ../git-debrebase:2982 +#: ../git-debrebase:3002 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:298 +#: ../Debian/Dgit.pm:299 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit.pm:325 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:344 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:345 +#: ../Debian/Dgit.pm:346 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:348 +#: ../Debian/Dgit.pm:349 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:353 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:358 +#: ../Debian/Dgit.pm:359 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:365 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:367 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:368 +#: ../Debian/Dgit.pm:369 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:459 +#: ../Debian/Dgit.pm:460 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:469 +#: ../Debian/Dgit.pm:470 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:488 +#: ../Debian/Dgit.pm:489 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:494 +#: ../Debian/Dgit.pm:495 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:515 +#: ../Debian/Dgit.pm:516 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:518 +#: ../Debian/Dgit.pm:519 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:626 +#: ../Debian/Dgit.pm:627 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:627 +#: ../Debian/Dgit.pm:628 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:649 +#: ../Debian/Dgit.pm:653 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:655 +#: ../Debian/Dgit.pm:660 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2471,66 +2607,98 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 +#: ../Debian/Dgit.pm:665 ../Debian/Dgit.pm:667 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:769 +#: ../Debian/Dgit.pm:773 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:770 +#: ../Debian/Dgit.pm:774 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:786 +#: ../Debian/Dgit.pm:790 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:795 +#: ../Debian/Dgit.pm:799 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:809 +#: ../Debian/Dgit.pm:813 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:830 +#: ../Debian/Dgit.pm:834 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:916 +#: ../Debian/Dgit.pm:920 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:937 +#: ../Debian/Dgit.pm:941 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1005 +#: ../Debian/Dgit.pm:969 +#, perl-format +msgid "Taint recorded at time %s for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:971 +#, perl-format +msgid "Taint recorded at time %s for any package" +msgstr "" + +#: ../Debian/Dgit.pm:973 +#, perl-format +msgid "Taint recorded for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:975 +msgid "Taint recorded for any package" +msgstr "" + +#: ../Debian/Dgit.pm:987 +msgid "Uncorrectable error. If confused, consult administrator.\n" +msgstr "" + +#: ../Debian/Dgit.pm:990 +msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" +msgstr "" + +#: ../Debian/Dgit.pm:993 +#, perl-format +msgid "Forcing due to %s\n" +msgstr "" + +#: ../Debian/Dgit.pm:1058 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1028 +#: ../Debian/Dgit.pm:1081 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1089 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1045 +#: ../Debian/Dgit.pm:1098 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" |