diff options
Diffstat (limited to 'po/messages.pot')
| -rw-r--r-- | po/messages.pot | 978 |
1 files changed, 498 insertions, 480 deletions
diff --git a/po/messages.pot b/po/messages.pot index 840de39..69096f0 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,32 @@ #, fuzzy msgid "" msgstr "" +"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n" +"Project-Id-Version: dgit ongoing\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n" +"Project-Id-Version: dgit ongoing\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-01 15:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,78 +40,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:240 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:247 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:255 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:260 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:483 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:488 ../dgit:494 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:489 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:497 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:504 +#: ../dgit:508 msgid "protocol message" msgstr "" -#: ../dgit:512 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:533 +#: ../dgit:537 msgid "bad byte count" msgstr "" -#: ../dgit:536 +#: ../dgit:540 msgid "data block" msgstr "" -#: ../dgit:617 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:629 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:631 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:656 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +132,141 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:675 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:679 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:684 +#: ../dgit:688 msgid "too few arguments" msgstr "" -#: ../dgit:795 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:798 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:818 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:859 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:874 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:890 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:910 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:921 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:925 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1090 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1136 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1157 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1165 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1169 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1185 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1189 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1191 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1193 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1209 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1211 +#: ../dgit:1215 msgid "bad component" msgstr "" -#: ../dgit:1214 +#: ../dgit:1218 msgid "bad filename" msgstr "" -#: ../dgit:1216 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "" -#: ../dgit:1267 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1351 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +274,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1373 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1401 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1402 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1507 +#: ../dgit:1511 #, 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:1698 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1701 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1703 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1723 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1756 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1773 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1788 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1803 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1886 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1897 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1943 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1952 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1956 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1962 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2002 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2015 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2028 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2044 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2049 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2057 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2064 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2092 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2103 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2127 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2150 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +445,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2162 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2193 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2195 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2197 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2202 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2233 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2236 +#: ../dgit:2240 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2249 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2252 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2258 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2382 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "" -#: ../dgit:2464 +#: ../dgit:2468 msgid "package changelog" msgstr "" -#: ../dgit:2504 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2523 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2604 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2623 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2632 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +560,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2647 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2651 +#: ../dgit:2655 msgid "Import of source package" msgstr "" -#: ../dgit:2664 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2668 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -560,51 +583,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2710 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2714 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2718 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2734 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2829 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2844 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2888 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2903 +#: ../dgit:2907 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:2908 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +637,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2975 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3024 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3028 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3035 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3037 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3059 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3064 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3069 +#: ../dgit:3073 #, 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:3079 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +688,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3099 +#: ../dgit:3103 msgid "rewrite map" msgstr "" -#: ../dgit:3106 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3110 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3112 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3119 +#: ../dgit:3123 msgid "additional commits" msgstr "" -#: ../dgit:3122 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3147 +#: ../dgit:3151 msgid "last upload to archive" msgstr "" -#: ../dgit:3151 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "" -#: ../dgit:3234 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3241 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3246 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3274 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -722,15 +745,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3287 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3290 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3311 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -738,7 +761,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3320 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -748,7 +771,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3405 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +779,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3418 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3436 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3438 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3449 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -778,30 +801,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3464 +#: ../dgit:3468 msgid "fetched source tree" msgstr "" -#: ../dgit:3500 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3565 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3579 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3594 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3621 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +832,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3643 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3651 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3690 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3722 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3724 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3763 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +863,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3777 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -849,248 +872,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3792 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3810 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3818 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3833 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3849 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "" -#: ../dgit:3853 +#: ../dgit:3857 msgid "starting new git history" msgstr "" -#: ../dgit:3879 +#: ../dgit:3883 #, 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:3884 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3896 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3898 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3906 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3917 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3936 +#: ../dgit:3940 #, 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:3953 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3956 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3960 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4003 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4008 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4018 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4024 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4050 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4053 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4061 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4070 +#: ../dgit:4074 msgid "version currently in archive" msgstr "" -#: ../dgit:4079 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4087 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4097 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4100 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4114 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4170 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4179 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "" -#: ../dgit:4181 +#: ../dgit:4185 msgid "dgit view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4186 msgid "current archive contents" msgstr "" -#: ../dgit:4195 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4205 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4223 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4231 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4243 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4265 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4326 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4354 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4367 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4419 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4428 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4433 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4456 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4473 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1099,14 +1122,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4497 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4528 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1114,24 +1137,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4538 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4578 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4588 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1139,52 +1162,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4599 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4621 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4625 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4629 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4636 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4680 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4693 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4710 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4727 +#: ../dgit:4731 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1193,155 +1216,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4758 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4770 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4781 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4801 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4805 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4843 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4860 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4931 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4934 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4936 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4941 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4956 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4967 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5005 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5085 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5122 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5125 +#: ../dgit:5129 msgid "all done\n" msgstr "" -#: ../dgit:5134 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5142 +#: ../dgit:5146 msgid "bad param spec" msgstr "" -#: ../dgit:5148 +#: ../dgit:5152 msgid "bad previously spec" msgstr "" -#: ../dgit:5167 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5212 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5215 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5256 +#: ../dgit:5260 msgid "remote changes file" msgstr "" -#: ../dgit:5331 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5337 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "" -#: ../dgit:5341 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5345 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5375 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5404 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1349,31 +1372,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5411 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5417 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5424 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5431 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5440 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1381,16 +1404,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5449 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5454 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5459 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1399,63 +1422,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5481 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5495 +#: ../dgit:5499 msgid "converted" msgstr "" -#: ../dgit:5496 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5561 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5579 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5588 +#: ../dgit:5592 msgid "root commit" msgstr "" -#: ../dgit:5594 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5606 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5625 +#: ../dgit:5629 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5632 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5644 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5647 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5659 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1486,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5666 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5700 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5701 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5707 msgid "is series file\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5708 msgid "too long\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5737 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5880 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5890 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5992 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6023 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6028 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6039 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6130 +#: ../dgit:6134 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1532,58 +1555,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6144 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6181 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6184 +#: ../dgit:6188 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgstr "" -#: ../dgit:6190 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6194 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6201 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6204 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6207 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6210 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6214 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6223 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1615,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6273 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6302 +#: ../dgit:6306 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:6314 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6317 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6320 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6338 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6352 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6365 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6404 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6406 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6432 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6438 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6441 +#: ../dgit:6445 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6484 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6522 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6529 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6536 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6540 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6545 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6548 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6561 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1718,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6579 +#: ../dgit:6583 msgid "build successful\n" msgstr "" -#: ../dgit:6586 +#: ../dgit:6590 #, 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:6696 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6731 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6751 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6764 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6768 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6775 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6781 +#: ../dgit:6785 msgid "source changes file" msgstr "" -#: ../dgit:6783 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6818 +#: ../dgit:6822 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:6830 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6834 +#: ../dgit:6838 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:6864 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6886 +#: ../dgit:6890 msgid "source tree" msgstr "" -#: ../dgit:6888 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6901 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6905 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6909 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6926 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6931 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6933 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6944 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6947 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6958 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6969 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6978 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1855,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6985 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6987 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6992 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6997 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,139 +1877,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7009 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7011 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7019 -#, perl-format -msgid "cannot import %s which seems to be inside working tree!" -msgstr "" - -#: ../dgit:7023 +#: ../dgit:7031 #, perl-format -msgid "import %s requires .../%s, but it does not exist" +msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7050 #, perl-format -msgid "import %s requires %s, but: %s" +msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7030 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7044 +#: ../dgit:7068 msgid "Import, merging." msgstr "" -#: ../dgit:7058 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7067 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7074 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7080 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7094 +#: ../dgit:7118 msgid "need destination argument" msgstr "" -#: ../dgit:7099 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7107 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7118 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7124 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7143 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7190 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7229 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7233 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7324 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7344 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7414 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7418 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7424 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1994,44 +2012,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7454 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7474 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7484 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7489 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7500 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7521 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7522 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7541 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2335,7 +2353,7 @@ msgstr "" msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2343,201 +2361,201 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, 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:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2545,58 +2563,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, 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:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2604,12 +2622,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2617,16 +2635,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2634,84 +2652,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 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:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" |