diff options
Diffstat (limited to 'po/en_US.po')
| -rw-r--r-- | po/en_US.po | 984 |
1 files changed, 482 insertions, 502 deletions
diff --git a/po/en_US.po b/po/en_US.po index e8cd03f..bd4bc79 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-21 00:36+0000\n" +"POT-Creation-Date: 2019-08-10 18:42+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -17,78 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:264 +#: ../dgit:265 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:271 +#: ../dgit:272 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:279 +#: ../dgit:280 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:284 +#: ../dgit:285 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:516 +#: ../dgit:517 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:521 ../dgit:527 +#: ../dgit:522 ../dgit:528 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:522 +#: ../dgit:523 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:530 +#: ../dgit:531 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:537 +#: ../dgit:538 msgid "protocol message" msgstr "" -#: ../dgit:545 +#: ../dgit:546 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:566 +#: ../dgit:567 msgid "bad byte count" msgstr "" -#: ../dgit:569 +#: ../dgit:570 msgid "data block" msgstr "" -#: ../dgit:650 -#, perl-format -msgid "failed to fetch %s: %s" -msgstr "" - -#: ../dgit:662 +#: ../dgit:649 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:664 +#: ../dgit:651 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:689 +#: ../dgit:676 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,153 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:708 +#: ../dgit:695 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:712 +#: ../dgit:699 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:717 +#: ../dgit:704 msgid "too few arguments" msgstr "" -#: ../dgit:833 +#: ../dgit:820 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:836 +#: ../dgit:823 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:856 +#: ../dgit:843 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:897 +#: ../dgit:884 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:912 +#: ../dgit:899 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:928 +#: ../dgit:915 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:948 +#: ../dgit:935 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:966 +#: ../dgit:953 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206 +#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209 msgid "internal error" msgstr "" -#: ../dgit:973 +#: ../dgit:960 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:977 +#: ../dgit:964 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1000 +#: ../dgit:987 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1163 +#: ../dgit:1150 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1209 +#: ../dgit:1217 #, perl-format -msgid "" -"config requested specific TLS key but do not know how to get curl to use " -"exactly that EE key (%s)" +msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1230 -msgid "ftpmasterapi archive query method takes no data part" -msgstr "" - -#: ../dgit:1238 -msgid "curl failed to print 3-digit HTTP code" -msgstr "" - -#: ../dgit:1242 +#: ../dgit:1224 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1258 +#: ../dgit:1245 +msgid "ftpmasterapi archive query method takes no data part" +msgstr "" + +#: ../dgit:1263 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1262 +#: ../dgit:1267 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1264 +#: ../dgit:1269 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1266 +#: ../dgit:1271 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1268 ../dgit:1293 +#: ../dgit:1273 ../dgit:1298 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1282 +#: ../dgit:1287 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1284 +#: ../dgit:1289 msgid "bad component" msgstr "" -#: ../dgit:1287 +#: ../dgit:1292 msgid "bad filename" msgstr "" -#: ../dgit:1289 +#: ../dgit:1294 msgid "bad sha256sum" msgstr "" -#: ../dgit:1340 +#: ../dgit:1345 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1424 +#: ../dgit:1429 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -263,163 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1448 +#: ../dgit:1453 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1474 +#: ../dgit:1479 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1475 +#: ../dgit:1480 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1580 +#: ../dgit:1585 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1719 +#: ../dgit:1724 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1722 +#: ../dgit:1727 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1724 +#: ../dgit:1729 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1744 +#: ../dgit:1749 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1750 +#: ../dgit:1755 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1777 +#: ../dgit:1782 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1794 -msgid "unexpected results from git check query - " -msgstr "" - -#: ../dgit:1809 +#: ../dgit:1805 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1824 +#: ../dgit:1820 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1861 +#: ../dgit:1857 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1907 +#: ../dgit:1903 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1918 +#: ../dgit:1914 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1964 +#: ../dgit:1960 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1973 +#: ../dgit:1969 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1977 +#: ../dgit:1973 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1983 +#: ../dgit:1979 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2023 +#: ../dgit:2019 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2036 +#: ../dgit:2032 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2049 +#: ../dgit:2045 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2065 +#: ../dgit:2061 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2070 +#: ../dgit:2066 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2078 +#: ../dgit:2074 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2085 +#: ../dgit:2081 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2113 +#: ../dgit:2109 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2121 +#: ../dgit:2117 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2124 +#: ../dgit:2120 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2143 +#: ../dgit:2139 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2166 +#: ../dgit:2162 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -434,108 +419,108 @@ msgid "" "\n" msgstr "" -#: ../dgit:2178 +#: ../dgit:2174 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2209 +#: ../dgit:2205 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2211 +#: ../dgit:2207 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2213 +#: ../dgit:2209 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 +#: ../dgit:2214 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2243 +#: ../dgit:2239 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2247 +#: ../dgit:2243 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2249 +#: ../dgit:2245 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2252 +#: ../dgit:2248 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2261 +#: ../dgit:2257 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2265 +#: ../dgit:2261 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2268 +#: ../dgit:2264 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2274 +#: ../dgit:2270 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2345 +#: ../dgit:2341 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2407 +#: ../dgit:2403 msgid "package changelog" msgstr "" -#: ../dgit:2447 +#: ../dgit:2443 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2516 ../dgit:2521 +#: ../dgit:2512 ../dgit:2517 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2536 ../dgit:2543 +#: ../dgit:2532 ../dgit:2539 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2569 ../dgit:6035 +#: ../dgit:2565 ../dgit:6037 msgid "source package" msgstr "" -#: ../dgit:2647 +#: ../dgit:2643 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2666 +#: ../dgit:2662 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2675 +#: ../dgit:2671 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -544,16 +529,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2690 +#: ../dgit:2686 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2694 +#: ../dgit:2690 msgid "Import of source package" msgstr "" -#: ../dgit:2714 +#: ../dgit:2710 #, perl-format msgid "" "\n" @@ -562,51 +547,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2756 +#: ../dgit:2752 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2760 +#: ../dgit:2756 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2764 +#: ../dgit:2760 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2780 +#: ../dgit:2776 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2875 +#: ../dgit:2871 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2890 +#: ../dgit:2886 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2934 +#: ../dgit:2930 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2949 +#: ../dgit:2945 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2954 +#: ../dgit:2950 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -616,24 +601,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3101 +#: ../dgit:3097 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3106 +#: ../dgit:3102 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3111 +#: ../dgit:3107 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3121 +#: ../dgit:3117 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -642,54 +627,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3141 +#: ../dgit:3137 msgid "rewrite map" msgstr "" -#: ../dgit:3148 +#: ../dgit:3144 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3152 +#: ../dgit:3148 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3154 +#: ../dgit:3150 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3161 +#: ../dgit:3157 msgid "additional commits" msgstr "" -#: ../dgit:3164 +#: ../dgit:3160 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3189 +#: ../dgit:3185 msgid "last upload to archive" msgstr "" -#: ../dgit:3193 +#: ../dgit:3189 msgid "no version available from the archive" msgstr "" -#: ../dgit:3276 +#: ../dgit:3272 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3283 +#: ../dgit:3279 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3288 +#: ../dgit:3284 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3316 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -699,15 +684,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3329 +#: ../dgit:3325 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3332 +#: ../dgit:3328 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3353 +#: ../dgit:3349 #, perl-format msgid "" "\n" @@ -715,7 +700,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3362 +#: ../dgit:3358 #, perl-format msgid "" "\n" @@ -725,7 +710,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3447 +#: ../dgit:3443 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -733,19 +718,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3460 +#: ../dgit:3456 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3478 +#: ../dgit:3474 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3480 +#: ../dgit:3476 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3491 +#: ../dgit:3487 #, perl-format msgid "" "\n" @@ -755,30 +740,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3506 +#: ../dgit:3502 msgid "fetched source tree" msgstr "" -#: ../dgit:3542 +#: ../dgit:3538 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3607 +#: ../dgit:3603 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3621 +#: ../dgit:3617 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3636 +#: ../dgit:3632 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3663 +#: ../dgit:3659 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -786,30 +771,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3685 +#: ../dgit:3681 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3693 +#: ../dgit:3689 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3732 +#: ../dgit:3728 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3764 +#: ../dgit:3760 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3766 +#: ../dgit:3762 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3805 +#: ../dgit:3801 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -817,7 +802,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3819 +#: ../dgit:3815 msgid "" "\n" "Key\n" @@ -826,30 +811,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3834 +#: ../dgit:3830 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3852 +#: ../dgit:3848 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3860 +#: ../dgit:3866 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3875 +#: ../dgit:3881 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3891 +#: ../dgit:3893 msgid "fetching existing git history" msgstr "" -#: ../dgit:3895 +#: ../dgit:3896 msgid "starting new git history" msgstr "" @@ -905,178 +890,178 @@ msgid "" "\n" msgstr "" -#: ../dgit:4045 +#: ../dgit:4046 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4060 +#: ../dgit:4061 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4066 +#: ../dgit:4067 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4092 +#: ../dgit:4093 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4095 +#: ../dgit:4096 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4103 +#: ../dgit:4104 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4112 +#: ../dgit:4113 msgid "version currently in archive" msgstr "" -#: ../dgit:4121 +#: ../dgit:4122 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4129 +#: ../dgit:4130 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4140 +#: ../dgit:4141 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4143 +#: ../dgit:4144 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4157 +#: ../dgit:4158 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4213 +#: ../dgit:4214 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4222 +#: ../dgit:4223 msgid "maintainer view tag" msgstr "" -#: ../dgit:4224 +#: ../dgit:4225 msgid "dgit view tag" msgstr "" -#: ../dgit:4225 +#: ../dgit:4226 msgid "current archive contents" msgstr "" -#: ../dgit:4238 +#: ../dgit:4239 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4248 +#: ../dgit:4249 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4249 +#: ../dgit:4250 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4253 +#: ../dgit:4254 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4266 +#: ../dgit:4267 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4274 +#: ../dgit:4275 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4286 +#: ../dgit:4287 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4308 +#: ../dgit:4309 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4362 +#: ../dgit:4363 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5607 +#: ../dgit:5609 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5625 +#: ../dgit:5627 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5634 +#: ../dgit:5636 msgid "root commit" msgstr "" -#: ../dgit:5640 +#: ../dgit:5642 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5652 +#: ../dgit:5654 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5671 +#: ../dgit:5673 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5678 +#: ../dgit:5680 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5690 +#: ../dgit:5692 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5693 +#: ../dgit:5695 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5705 +#: ../dgit:5707 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1084,84 +1069,84 @@ msgid "" "\n" msgstr "" -#: ../dgit:5712 +#: ../dgit:5714 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5746 +#: ../dgit:5748 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5747 +#: ../dgit:5749 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5748 +#: ../dgit:5750 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5749 +#: ../dgit:5751 msgid "is series file\n" msgstr "" -#: ../dgit:5750 +#: ../dgit:5752 msgid "too long\n" msgstr "" -#: ../dgit:5754 +#: ../dgit:5756 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5783 +#: ../dgit:5785 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5866 +#: ../dgit:5868 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5884 +#: ../dgit:5886 msgid "converted" msgstr "" -#: ../dgit:5885 +#: ../dgit:5887 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5939 +#: ../dgit:5941 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5949 +#: ../dgit:5951 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6059 +#: ../dgit:6061 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6091 +#: ../dgit:6093 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6096 +#: ../dgit:6098 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6131 +#: ../dgit:6133 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6245 +#: ../dgit:6247 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1169,84 +1154,84 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6259 +#: ../dgit:6261 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6293 +#: ../dgit:6295 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6306 +#: ../dgit:6308 msgid "tarball" msgstr "" -#: ../dgit:6324 +#: ../dgit:6326 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6340 +#: ../dgit:6342 msgid "tarballs" msgstr "" -#: ../dgit:6354 +#: ../dgit:6356 msgid "upstream" msgstr "" -#: ../dgit:6378 +#: ../dgit:6380 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6388 +#: ../dgit:6390 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6397 +#: ../dgit:6399 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6401 +#: ../dgit:6403 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6408 +#: ../dgit:6410 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6412 +#: ../dgit:6414 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6415 +#: ../dgit:6417 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6418 +#: ../dgit:6420 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6421 +#: ../dgit:6423 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6425 +#: ../dgit:6427 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6436 +#: ../dgit:6438 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6475 +#: ../dgit:6477 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1255,124 +1240,124 @@ msgid "" "\n" msgstr "" -#: ../dgit:6487 +#: ../dgit:6489 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6516 +#: ../dgit:6518 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6528 +#: ../dgit:6530 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6531 +#: ../dgit:6533 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6534 +#: ../dgit:6536 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6547 +#: ../dgit:6549 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6564 +#: ../dgit:6566 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6578 +#: ../dgit:6580 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6597 +#: ../dgit:6599 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6607 +#: ../dgit:6609 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6616 +#: ../dgit:6618 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6620 +#: ../dgit:6622 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6655 +#: ../dgit:6657 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6657 +#: ../dgit:6659 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6683 +#: ../dgit:6685 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6689 +#: ../dgit:6691 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6692 +#: ../dgit:6694 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6735 +#: ../dgit:6737 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6773 +#: ../dgit:6775 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6780 +#: ../dgit:6782 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6787 +#: ../dgit:6789 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6791 +#: ../dgit:6793 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6796 +#: ../dgit:6798 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6799 +#: ../dgit:6801 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6812 +#: ../dgit:6814 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1380,136 +1365,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6830 +#: ../dgit:6832 msgid "build successful\n" msgstr "" -#: ../dgit:6837 +#: ../dgit:6839 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6947 +#: ../dgit:6949 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6984 +#: ../dgit:6986 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7004 +#: ../dgit:7006 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7017 +#: ../dgit:7019 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7021 +#: ../dgit:7023 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7030 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7034 +#: ../dgit:7036 msgid "source changes file" msgstr "" -#: ../dgit:7036 +#: ../dgit:7038 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7056 ../dgit:7058 +#: ../dgit:7058 ../dgit:7060 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7071 +#: ../dgit:7073 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:7083 +#: ../dgit:7085 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7087 +#: ../dgit:7089 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:7117 +#: ../dgit:7119 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7138 +#: ../dgit:7140 msgid "source tree" msgstr "" -#: ../dgit:7140 +#: ../dgit:7142 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7153 +#: ../dgit:7155 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7157 +#: ../dgit:7159 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7161 +#: ../dgit:7163 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7178 +#: ../dgit:7180 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7183 +#: ../dgit:7185 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7185 +#: ../dgit:7187 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7196 +#: ../dgit:7198 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7199 +#: ../dgit:7201 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7210 +#: ../dgit:7212 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7221 +#: ../dgit:7223 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7230 +#: ../dgit:7232 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1517,21 +1502,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7237 +#: ../dgit:7239 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7239 +#: ../dgit:7241 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7244 +#: ../dgit:7246 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7249 +#: ../dgit:7251 #, perl-format msgid "" "Branch %s already exists\n" @@ -1539,63 +1524,58 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7269 +#: ../dgit:7271 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7271 +#: ../dgit:7273 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7279 +#: ../dgit:7281 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7298 +#: ../dgit:7300 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7302 +#: ../dgit:7304 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7303 +#: ../dgit:7305 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7314 +#: ../dgit:7316 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7316 +#: ../dgit:7318 msgid "Import, merging." msgstr "" -#: ../dgit:7330 +#: ../dgit:7332 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7341 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7346 +#: ../dgit:7348 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7352 -#, perl-format -msgid "exec curl: %s\n" -msgstr "" - #: ../dgit:7366 msgid "need destination argument" msgstr "" @@ -1646,27 +1626,27 @@ msgstr "" msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7620 +#: ../dgit:7623 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7675 +#: ../dgit:7678 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7690 +#: ../dgit:7693 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7694 +#: ../dgit:7697 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7700 +#: ../dgit:7703 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1674,35 +1654,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7717 +#: ../dgit:7720 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7730 +#: ../dgit:7733 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7750 +#: ../dgit:7753 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7761 +#: ../dgit:7764 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7789 +#: ../dgit:7792 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:7793 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7809 +#: ../dgit:7812 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1735,45 +1715,45 @@ msgstr "" msgid "missing required git config %s" msgstr "" -#: ../git-debrebase:364 +#: ../git-debrebase:363 #, perl-format msgid "%s: snag ignored (-f%s): %s\n" msgstr "" -#: ../git-debrebase:367 +#: ../git-debrebase:366 #, perl-format msgid "%s: snag detected (-f%s): %s\n" msgstr "" -#: ../git-debrebase:380 +#: ../git-debrebase:379 #, perl-format msgid "%s: snags: %d overriden by individual -f options\n" msgstr "" -#: ../git-debrebase:386 +#: ../git-debrebase:385 #, perl-format msgid "%s: snags: %d overriden by global --force\n" msgstr "" -#: ../git-debrebase:390 +#: ../git-debrebase:389 #, perl-format msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)" msgstr "" -#: ../git-debrebase:422 +#: ../git-debrebase:421 msgid "" "Branch/history seems mangled - no longer in gdr format.\n" "See ILLEGAL OPERATIONS in git-debrebase(5).\n" msgstr "" -#: ../git-debrebase:429 +#: ../git-debrebase:428 #, perl-format msgid "" "%s\n" "Is this meant to be a gdr branch? %s\n" msgstr "" -#: ../git-debrebase:434 +#: ../git-debrebase:433 #, perl-format msgid "" "%s\n" @@ -1781,7 +1761,7 @@ msgid "" "Consider git-debrebase scrap, to throw away your recent work.\n" msgstr "" -#: ../git-debrebase:440 +#: ../git-debrebase:439 #, perl-format msgid "" "%s\n" @@ -1789,7 +1769,7 @@ msgid "" "Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" msgstr "" -#: ../git-debrebase:451 +#: ../git-debrebase:450 #, perl-format msgid "" "%s\n" @@ -1797,415 +1777,415 @@ msgid "" "Maybe you reset to, or rebased from, somewhere inappropriate.\n" msgstr "" -#: ../git-debrebase:898 +#: ../git-debrebase:897 #, perl-format msgid "git-debrebase `anchor' but %s" msgstr "" -#: ../git-debrebase:900 +#: ../git-debrebase:899 msgid "has other than two parents" msgstr "" -#: ../git-debrebase:901 +#: ../git-debrebase:900 msgid "contains debian/patches" msgstr "" -#: ../git-debrebase:927 +#: ../git-debrebase:926 msgid "is an origin commit" msgstr "" -#: ../git-debrebase:929 +#: ../git-debrebase:928 msgid "upstream files differ from left parent" msgstr "" -#: ../git-debrebase:931 +#: ../git-debrebase:930 msgid "debian/ differs from right parent" msgstr "" -#: ../git-debrebase:942 +#: ../git-debrebase:941 msgid "edits debian/patches" msgstr "" -#: ../git-debrebase:954 +#: ../git-debrebase:953 msgid "parent's debian is not a directory" msgstr "" -#: ../git-debrebase:961 +#: ../git-debrebase:960 msgid "no changes" msgstr "" -#: ../git-debrebase:967 +#: ../git-debrebase:966 msgid "origin commit" msgstr "" -#: ../git-debrebase:1018 +#: ../git-debrebase:1017 #, perl-format msgid "unknown kind of merge from %s" msgstr "" -#: ../git-debrebase:1021 +#: ../git-debrebase:1020 msgid "octopus merge" msgstr "" -#: ../git-debrebase:1025 +#: ../git-debrebase:1024 msgid "general two-parent merge" msgstr "" -#: ../git-debrebase:1042 +#: ../git-debrebase:1041 #, perl-format msgid "inconsistent anchors in merged-breakwaters %s" msgstr "" -#: ../git-debrebase:1082 +#: ../git-debrebase:1081 #, perl-format msgid "branch needs laundering (run git-debrebase): %s" msgstr "" -#: ../git-debrebase:1110 +#: ../git-debrebase:1109 #, perl-format msgid "packaging change (%s) follows upstream change" msgstr "" -#: ../git-debrebase:1111 +#: ../git-debrebase:1110 #, perl-format msgid " (eg %s)" msgstr "" -#: ../git-debrebase:1117 +#: ../git-debrebase:1116 msgid "found mixed upstream/packaging commit" msgstr "" -#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131 -#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150 +#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130 +#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149 #, perl-format msgid " (%s)" msgstr "" -#: ../git-debrebase:1125 +#: ../git-debrebase:1124 #, perl-format msgid "found interchange bureaucracy commit (%s)" msgstr "" -#: ../git-debrebase:1130 +#: ../git-debrebase:1129 msgid "found dgit dsc import" msgstr "" -#: ../git-debrebase:1135 +#: ../git-debrebase:1134 msgid "found bare dgit dsc import with no prior history" msgstr "" -#: ../git-debrebase:1141 +#: ../git-debrebase:1140 msgid "found vanilla merge" msgstr "" -#: ../git-debrebase:1148 +#: ../git-debrebase:1147 #, perl-format msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1216 +#: ../git-debrebase:1215 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1217 +#: ../git-debrebase:1216 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1338 +#: ../git-debrebase:1337 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1678 ../git-debrebase:1681 +#: ../git-debrebase:1677 ../git-debrebase:1680 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1684 +#: ../git-debrebase:1683 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1694 +#: ../git-debrebase:1693 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1722 +#: ../git-debrebase:1721 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1736 +#: ../git-debrebase:1735 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1762 +#: ../git-debrebase:1761 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1767 +#: ../git-debrebase:1766 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1769 +#: ../git-debrebase:1768 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1802 +#: ../git-debrebase:1801 #, perl-format msgid "%s already exists" msgstr "" -#: ../git-debrebase:1804 +#: ../git-debrebase:1803 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1827 +#: ../git-debrebase:1826 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1831 +#: ../git-debrebase:1830 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1835 +#: ../git-debrebase:1834 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1857 +#: ../git-debrebase:1856 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1860 +#: ../git-debrebase:1859 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1888 +#: ../git-debrebase:1887 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1896 +#: ../git-debrebase:1895 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1907 +#: ../git-debrebase:1906 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1927 +#: ../git-debrebase:1926 msgid "fast forward" msgstr "" -#: ../git-debrebase:1937 +#: ../git-debrebase:1936 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1949 +#: ../git-debrebase:1948 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:1966 +#: ../git-debrebase:1965 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:1971 +#: ../git-debrebase:1970 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:1989 +#: ../git-debrebase:1988 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:1990 +#: ../git-debrebase:1989 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2010 +#: ../git-debrebase:2009 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2028 +#: ../git-debrebase:2027 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "old anchor is recognized due to --anchor, cannot check upstream" -#: ../git-debrebase:2044 +#: ../git-debrebase:2043 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2053 +#: ../git-debrebase:2052 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2066 +#: ../git-debrebase:2065 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2077 +#: ../git-debrebase:2076 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2080 +#: ../git-debrebase:2079 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2083 +#: ../git-debrebase:2082 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2194 +#: ../git-debrebase:2193 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2198 +#: ../git-debrebase:2197 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215 -#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338 -#: ../git-debrebase:2402 +#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 +#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 +#: ../git-debrebase:2401 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2237 +#: ../git-debrebase:2236 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2238 +#: ../git-debrebase:2237 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2239 +#: ../git-debrebase:2238 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2240 +#: ../git-debrebase:2239 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2250 +#: ../git-debrebase:2249 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2252 +#: ../git-debrebase:2251 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2268 +#: ../git-debrebase:2267 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2274 +#: ../git-debrebase:2273 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2275 +#: ../git-debrebase:2274 msgid "anchor" msgstr "" -#: ../git-debrebase:2276 +#: ../git-debrebase:2275 msgid "breakwater" msgstr "" -#: ../git-debrebase:2281 +#: ../git-debrebase:2280 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2288 +#: ../git-debrebase:2287 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2291 +#: ../git-debrebase:2290 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2293 +#: ../git-debrebase:2292 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2295 +#: ../git-debrebase:2294 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2298 +#: ../git-debrebase:2297 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2315 ../git-debrebase:2328 +#: ../git-debrebase:2314 ../git-debrebase:2327 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2322 ../git-debrebase:2352 +#: ../git-debrebase:2321 ../git-debrebase:2351 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2391 +#: ../git-debrebase:2390 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2408 +#: ../git-debrebase:2407 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2415 +#: ../git-debrebase:2414 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2435 +#: ../git-debrebase:2434 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2440 +#: ../git-debrebase:2439 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2447 +#: ../git-debrebase:2446 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2455 +#: ../git-debrebase:2454 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2460 +#: ../git-debrebase:2459 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2476 +#: ../git-debrebase:2475 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2480 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2497 +#: ../git-debrebase:2496 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2213,58 +2193,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2505 +#: ../git-debrebase:2504 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2512 +#: ../git-debrebase:2511 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2514 +#: ../git-debrebase:2513 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2520 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2539 +#: ../git-debrebase:2538 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2545 +#: ../git-debrebase:2544 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2548 +#: ../git-debrebase:2547 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2551 +#: ../git-debrebase:2550 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2553 +#: ../git-debrebase:2552 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2555 +#: ../git-debrebase:2554 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2561 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2272,12 +2252,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2608 +#: ../git-debrebase:2607 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2637 +#: ../git-debrebase:2636 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2285,16 +2265,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2658 +#: ../git-debrebase:2657 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2666 +#: ../git-debrebase:2665 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2680 +#: ../git-debrebase:2679 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2302,175 +2282,175 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2684 +#: ../git-debrebase:2683 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2696 +#: ../git-debrebase:2695 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2702 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2709 +#: ../git-debrebase:2708 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2718 +#: ../git-debrebase:2717 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2723 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2755 +#: ../git-debrebase:2754 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2764 +#: ../git-debrebase:2763 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2801 +#: ../git-debrebase:2800 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2810 +#: ../git-debrebase:2809 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2824 +#: ../git-debrebase:2823 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2829 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2837 +#: ../git-debrebase:2836 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2841 +#: ../git-debrebase:2840 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2943 +#: ../git-debrebase:2942 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2953 +#: ../git-debrebase:2952 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:2983 +#: ../git-debrebase:2982 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:293 +#: ../Debian/Dgit.pm:296 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:319 +#: ../Debian/Dgit.pm:322 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:338 +#: ../Debian/Dgit.pm:341 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:340 +#: ../Debian/Dgit.pm:343 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:346 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:347 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:353 +#: ../Debian/Dgit.pm:356 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:359 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:361 +#: ../Debian/Dgit.pm:364 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:363 +#: ../Debian/Dgit.pm:366 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:454 +#: ../Debian/Dgit.pm:457 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:464 +#: ../Debian/Dgit.pm:467 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:483 +#: ../Debian/Dgit.pm:486 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:489 +#: ../Debian/Dgit.pm:492 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:510 +#: ../Debian/Dgit.pm:513 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:513 +#: ../Debian/Dgit.pm:516 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:621 +#: ../Debian/Dgit.pm:624 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:622 +#: ../Debian/Dgit.pm:625 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:644 +#: ../Debian/Dgit.pm:647 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:650 +#: ../Debian/Dgit.pm:653 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2478,66 +2458,66 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658 +#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:764 +#: ../Debian/Dgit.pm:767 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:765 +#: ../Debian/Dgit.pm:768 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:781 +#: ../Debian/Dgit.pm:784 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:790 +#: ../Debian/Dgit.pm:793 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:804 +#: ../Debian/Dgit.pm:807 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:825 +#: ../Debian/Dgit.pm:828 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:914 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:932 +#: ../Debian/Dgit.pm:935 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1000 +#: ../Debian/Dgit.pm:1003 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1023 +#: ../Debian/Dgit.pm:1026 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1031 +#: ../Debian/Dgit.pm:1034 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1040 +#: ../Debian/Dgit.pm:1043 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" |