X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=po%2Fmessages.pot;fp=po%2Fmessages.pot;h=f81c3ef31dbfba23ce099e87e21d102b797b0f71;hb=9bdd848102280e5f633db852c1b15ff27716c1c0;hp=20337c882af1b5908a2eceb28dc540bc474482de;hpb=0193f7cd974e8c4a15a41d26b8a43c8f9fcb79b7;p=dgit.git diff --git a/po/messages.pot b/po/messages.pot index 20337c88..f81c3ef3 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 \n" "Language-Team: LANGUAGE \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= 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" 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 ""