diff options
| -rw-r--r-- | po/en_US.po | 794 | ||||
| -rw-r--r-- | po/messages.pot | 817 | ||||
| -rw-r--r-- | po/nl.po | 808 | ||||
| -rw-r--r-- | po4a/dgit-downstream-dsc_7.pot | 27 | ||||
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 12 | ||||
| -rw-r--r-- | po4a/dgit-maint-native_7.pot | 10 | ||||
| -rw-r--r-- | po4a/dgit-sponsorship_7.pot | 14 | ||||
| -rw-r--r-- | po4a/dgit-user_7.nl.po | 13 | ||||
| -rw-r--r-- | po4a/dgit-user_7.pot | 6 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 132 | ||||
| -rw-r--r-- | po4a/dgit_7.pot | 12 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 16 | ||||
| -rw-r--r-- | po4a/git-debrebase_5.pot | 38 |
13 files changed, 1350 insertions, 1349 deletions
diff --git a/po/en_US.po b/po/en_US.po index 0e4ddfb..901bb4e 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-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:240 +#: ../dgit:241 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:247 +#: ../dgit:248 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:255 +#: ../dgit:256 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:260 +#: ../dgit:261 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:483 +#: ../dgit:484 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:488 ../dgit:494 +#: ../dgit:489 ../dgit:495 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:489 +#: ../dgit:490 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:497 +#: ../dgit:498 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:504 +#: ../dgit:505 msgid "protocol message" msgstr "" -#: ../dgit:512 +#: ../dgit:513 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:533 +#: ../dgit:534 msgid "bad byte count" msgstr "" -#: ../dgit:536 +#: ../dgit:537 msgid "data block" msgstr "" -#: ../dgit:617 +#: ../dgit:618 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:629 +#: ../dgit:630 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:631 +#: ../dgit:632 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:656 +#: ../dgit:657 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +109,141 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:675 +#: ../dgit:676 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:679 +#: ../dgit:680 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:684 +#: ../dgit:685 msgid "too few arguments" msgstr "" -#: ../dgit:795 +#: ../dgit:796 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:798 +#: ../dgit:799 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:818 +#: ../dgit:819 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:859 +#: ../dgit:860 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:874 +#: ../dgit:875 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:890 +#: ../dgit:891 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:910 +#: ../dgit:911 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:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:921 +#: ../dgit:922 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:925 +#: ../dgit:926 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:1091 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1136 +#: ../dgit:1137 #, 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:1158 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1165 +#: ../dgit:1166 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1169 +#: ../dgit:1170 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1185 +#: ../dgit:1186 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1189 +#: ../dgit:1190 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1191 +#: ../dgit:1192 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1193 +#: ../dgit:1194 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1196 ../dgit:1221 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1209 +#: ../dgit:1210 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1211 +#: ../dgit:1212 msgid "bad component" msgstr "" -#: ../dgit:1214 +#: ../dgit:1215 msgid "bad filename" msgstr "" -#: ../dgit:1216 +#: ../dgit:1217 msgid "bad sha256sum" msgstr "" -#: ../dgit:1267 +#: ../dgit:1268 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1351 +#: ../dgit:1352 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +251,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1373 +#: ../dgit:1374 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1401 +#: ../dgit:1402 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1402 +#: ../dgit:1403 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1507 +#: ../dgit:1508 #, 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:1699 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1701 +#: ../dgit:1702 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1703 +#: ../dgit:1704 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1723 +#: ../dgit:1724 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1730 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1756 +#: ../dgit:1757 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1773 +#: ../dgit:1774 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1788 +#: ../dgit:1789 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1803 +#: ../dgit:1804 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1841 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1886 +#: ../dgit:1887 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1897 +#: ../dgit:1898 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1943 +#: ../dgit:1944 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1952 +#: ../dgit:1953 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1956 +#: ../dgit:1957 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1962 +#: ../dgit:1963 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2002 +#: ../dgit:2003 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2015 +#: ../dgit:2016 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2028 +#: ../dgit:2029 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2044 +#: ../dgit:2045 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2049 +#: ../dgit:2050 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2057 +#: ../dgit:2058 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2064 +#: ../dgit:2065 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2092 +#: ../dgit:2093 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2103 +#: ../dgit:2104 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2127 +#: ../dgit:2128 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2150 +#: ../dgit:2151 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +422,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2162 +#: ../dgit:2163 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2193 +#: ../dgit:2194 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2195 +#: ../dgit:2196 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2197 +#: ../dgit:2198 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2202 +#: ../dgit:2203 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2228 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2232 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2236 +#: ../dgit:2237 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2246 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2249 +#: ../dgit:2250 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2252 +#: ../dgit:2253 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2291 ../dgit:2296 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2311 ../dgit:2318 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2382 +#: ../dgit:2383 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2447 ../dgit:5971 msgid "source package" msgstr "" -#: ../dgit:2464 +#: ../dgit:2465 msgid "package changelog" msgstr "" -#: ../dgit:2504 +#: ../dgit:2505 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2523 +#: ../dgit:2524 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2604 +#: ../dgit:2605 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2623 +#: ../dgit:2624 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2632 +#: ../dgit:2633 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2647 +#: ../dgit:2648 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2651 +#: ../dgit:2652 msgid "Import of source package" msgstr "" -#: ../dgit:2664 +#: ../dgit:2665 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2668 +#: ../dgit:2669 #, perl-format msgid "" "\n" @@ -560,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2710 +#: ../dgit:2711 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2714 +#: ../dgit:2715 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2718 +#: ../dgit:2719 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2734 +#: ../dgit:2735 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2829 +#: ../dgit:2830 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2844 +#: ../dgit:2845 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2888 +#: ../dgit:2889 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2903 +#: ../dgit:2904 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:2909 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2975 +#: ../dgit:2976 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3024 +#: ../dgit:3025 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3028 +#: ../dgit:3029 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3035 +#: ../dgit:3036 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3037 +#: ../dgit:3038 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3059 +#: ../dgit:3060 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3064 +#: ../dgit:3065 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3069 +#: ../dgit:3070 #, 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:3080 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3099 +#: ../dgit:3100 msgid "rewrite map" msgstr "" -#: ../dgit:3106 +#: ../dgit:3107 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3110 +#: ../dgit:3111 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3112 +#: ../dgit:3113 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3119 +#: ../dgit:3120 msgid "additional commits" msgstr "" -#: ../dgit:3122 +#: ../dgit:3123 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3147 +#: ../dgit:3148 msgid "last upload to archive" msgstr "" -#: ../dgit:3151 +#: ../dgit:3152 msgid "no version available from the archive" msgstr "" -#: ../dgit:3234 +#: ../dgit:3235 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3241 +#: ../dgit:3242 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3246 +#: ../dgit:3247 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3274 +#: ../dgit:3275 #, perl-format msgid "" "\n" @@ -722,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3287 +#: ../dgit:3288 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3290 +#: ../dgit:3291 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3311 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -738,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3320 +#: ../dgit:3321 #, perl-format msgid "" "\n" @@ -748,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3405 +#: ../dgit:3406 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3418 +#: ../dgit:3419 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3436 +#: ../dgit:3437 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3438 +#: ../dgit:3439 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3449 +#: ../dgit:3450 #, perl-format msgid "" "\n" @@ -778,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3464 +#: ../dgit:3465 msgid "fetched source tree" msgstr "" -#: ../dgit:3500 +#: ../dgit:3501 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3565 +#: ../dgit:3566 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3579 +#: ../dgit:3580 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3594 +#: ../dgit:3595 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3621 +#: ../dgit:3622 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3643 +#: ../dgit:3644 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3651 +#: ../dgit:3652 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3690 +#: ../dgit:3691 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3722 +#: ../dgit:3723 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3724 +#: ../dgit:3725 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3763 +#: ../dgit:3764 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3777 +#: ../dgit:3778 msgid "" "\n" "Key\n" @@ -849,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3792 +#: ../dgit:3793 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3810 +#: ../dgit:3811 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3818 +#: ../dgit:3819 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3833 +#: ../dgit:3834 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3849 +#: ../dgit:3850 msgid "fetching existing git history" msgstr "" -#: ../dgit:3853 +#: ../dgit:3854 msgid "starting new git history" msgstr "" -#: ../dgit:3879 +#: ../dgit:3880 #, 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:3885 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3896 +#: ../dgit:3897 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3898 +#: ../dgit:3899 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3906 +#: ../dgit:3907 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3917 +#: ../dgit:3918 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3936 +#: ../dgit:3937 #, 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:3954 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3956 +#: ../dgit:3957 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3960 +#: ../dgit:3961 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4003 +#: ../dgit:4004 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4008 +#: ../dgit:4009 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4018 +#: ../dgit:4019 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4024 +#: ../dgit:4025 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4053 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4061 +#: ../dgit:4062 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4070 +#: ../dgit:4071 msgid "version currently in archive" msgstr "" -#: ../dgit:4079 +#: ../dgit:4080 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4087 +#: ../dgit:4088 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4097 +#: ../dgit:4098 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4100 +#: ../dgit:4101 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4114 +#: ../dgit:4115 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4170 +#: ../dgit:4171 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4179 +#: ../dgit:4180 msgid "maintainer view tag" msgstr "" -#: ../dgit:4181 +#: ../dgit:4182 msgid "dgit view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4183 msgid "current archive contents" msgstr "" -#: ../dgit:4195 +#: ../dgit:4196 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4205 +#: ../dgit:4206 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4207 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4211 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4223 +#: ../dgit:4224 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4231 +#: ../dgit:4232 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4243 +#: ../dgit:4244 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4265 +#: ../dgit:4266 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4326 +#: ../dgit:4327 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4354 +#: ../dgit:4355 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4367 +#: ../dgit:4368 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4419 +#: ../dgit:4420 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:4429 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4433 +#: ../dgit:4434 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:4457 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4473 +#: ../dgit:4474 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1099,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4497 +#: ../dgit:4498 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4528 +#: ../dgit:4529 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 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4538 +#: ../dgit:4539 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4573 ../dgit:4585 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4578 +#: ../dgit:4579 #, 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:4589 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1139,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4599 +#: ../dgit:4600 #, 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:4622 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4625 +#: ../dgit:4626 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4629 +#: ../dgit:4630 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4636 +#: ../dgit:4637 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4680 +#: ../dgit:4681 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:4694 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:4711 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:4728 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 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4758 +#: ../dgit:4759 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4770 +#: ../dgit:4771 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4781 +#: ../dgit:4782 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4788 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4801 +#: ../dgit:4802 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4805 +#: ../dgit:4806 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4843 +#: ../dgit:4844 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4860 +#: ../dgit:4861 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4870 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4931 +#: ../dgit:4932 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4934 +#: ../dgit:4935 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4936 +#: ../dgit:4937 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4941 +#: ../dgit:4942 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4956 +#: ../dgit:4957 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4967 +#: ../dgit:4968 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5005 +#: ../dgit:5006 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5085 +#: ../dgit:5086 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5122 +#: ../dgit:5123 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5125 +#: ../dgit:5126 msgid "all done\n" msgstr "" -#: ../dgit:5134 +#: ../dgit:5135 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5142 +#: ../dgit:5143 msgid "bad param spec" msgstr "" -#: ../dgit:5148 +#: ../dgit:5149 msgid "bad previously spec" msgstr "" -#: ../dgit:5167 +#: ../dgit:5168 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5212 +#: ../dgit:5213 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5215 +#: ../dgit:5216 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5256 +#: ../dgit:5257 msgid "remote changes file" msgstr "" -#: ../dgit:5331 +#: ../dgit:5332 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5337 +#: ../dgit:5338 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5339 msgid "modified symlink\n" msgstr "" -#: ../dgit:5341 +#: ../dgit:5342 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5345 +#: ../dgit:5346 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5375 +#: ../dgit:5376 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5404 +#: ../dgit:5405 #, perl-format msgid "" "\n" @@ -1349,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5411 +#: ../dgit:5412 #, 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:5418 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5424 +#: ../dgit:5425 #, 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:5432 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5440 +#: ../dgit:5441 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1381,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5449 +#: ../dgit:5450 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5454 +#: ../dgit:5455 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5459 +#: ../dgit:5460 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1399,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5481 +#: ../dgit:5482 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5495 +#: ../dgit:5496 msgid "converted" msgstr "" -#: ../dgit:5496 +#: ../dgit:5497 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5561 +#: ../dgit:5562 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5579 +#: ../dgit:5580 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5588 +#: ../dgit:5589 msgid "root commit" msgstr "" -#: ../dgit:5594 +#: ../dgit:5595 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5606 +#: ../dgit:5607 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5625 +#: ../dgit:5626 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5632 +#: ../dgit:5633 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5644 +#: ../dgit:5645 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5647 +#: ../dgit:5648 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5659 +#: ../dgit:5660 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5666 +#: ../dgit:5667 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5700 +#: ../dgit:5701 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5701 +#: ../dgit:5702 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5703 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5704 msgid "is series file\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5705 msgid "too long\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5709 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5737 +#: ../dgit:5738 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5880 +#: ../dgit:5881 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5890 +#: ../dgit:5891 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5992 +#: ../dgit:5993 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6023 +#: ../dgit:6024 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6028 +#: ../dgit:6029 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6039 +#: ../dgit:6040 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6130 +#: ../dgit:6131 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 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6144 +#: ../dgit:6145 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6181 +#: ../dgit:6182 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6184 +#: ../dgit:6185 #, 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:6191 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6194 +#: ../dgit:6195 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6201 +#: ../dgit:6202 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6204 +#: ../dgit:6205 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6207 +#: ../dgit:6208 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6210 +#: ../dgit:6211 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6214 +#: ../dgit:6215 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6223 +#: ../dgit:6224 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6262 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6273 +#: ../dgit:6274 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6302 +#: ../dgit:6303 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:6315 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6317 +#: ../dgit:6318 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6320 +#: ../dgit:6321 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6338 +#: ../dgit:6339 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6352 +#: ../dgit:6353 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6365 +#: ../dgit:6366 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6404 +#: ../dgit:6405 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6406 +#: ../dgit:6407 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6432 +#: ../dgit:6433 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6438 +#: ../dgit:6439 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6441 +#: ../dgit:6442 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6484 +#: ../dgit:6485 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6522 +#: ../dgit:6523 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6529 +#: ../dgit:6530 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6536 +#: ../dgit:6537 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6540 +#: ../dgit:6541 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6545 +#: ../dgit:6546 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6548 +#: ../dgit:6549 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6561 +#: ../dgit:6562 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6579 +#: ../dgit:6580 msgid "build successful\n" msgstr "" -#: ../dgit:6586 +#: ../dgit:6587 #, 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:6697 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6731 +#: ../dgit:6732 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6751 +#: ../dgit:6752 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6764 +#: ../dgit:6765 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6768 +#: ../dgit:6769 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6775 +#: ../dgit:6776 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6781 +#: ../dgit:6782 msgid "source changes file" msgstr "" -#: ../dgit:6783 +#: ../dgit:6784 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6804 ../dgit:6806 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6818 +#: ../dgit:6819 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:6831 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:6835 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:6865 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6886 +#: ../dgit:6887 msgid "source tree" msgstr "" -#: ../dgit:6888 +#: ../dgit:6889 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6901 +#: ../dgit:6902 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6905 +#: ../dgit:6906 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6909 +#: ../dgit:6910 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6926 +#: ../dgit:6927 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6931 +#: ../dgit:6932 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6933 +#: ../dgit:6934 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6944 +#: ../dgit:6945 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6947 +#: ../dgit:6948 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6958 +#: ../dgit:6959 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6969 +#: ../dgit:6970 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6978 +#: ../dgit:6979 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6985 +#: ../dgit:6986 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6987 +#: ../dgit:6988 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6992 +#: ../dgit:6993 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6997 +#: ../dgit:6998 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,139 +1854,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7009 +#: ../dgit:7016 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7011 +#: ../dgit:7018 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7019 +#: ../dgit:7037 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7023 -#, perl-format -msgid "import %s requires .../%s, but it does not exist" -msgstr "" - -#: ../dgit:7028 -#, perl-format -msgid "import %s requires %s, but: %s" -msgstr "" - -#: ../dgit:7030 +#: ../dgit:7041 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7042 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7053 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7044 +#: ../dgit:7055 msgid "Import, merging." msgstr "" -#: ../dgit:7058 +#: ../dgit:7069 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7067 +#: ../dgit:7078 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7074 +#: ../dgit:7085 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7080 +#: ../dgit:7091 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7094 +#: ../dgit:7105 msgid "need destination argument" msgstr "" -#: ../dgit:7099 +#: ../dgit:7110 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7107 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7118 +#: ../dgit:7129 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7124 +#: ../dgit:7135 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7142 ../dgit:7148 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7143 +#: ../dgit:7154 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7190 +#: ../dgit:7201 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7229 +#: ../dgit:7240 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7233 +#: ../dgit:7244 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7324 +#: ../dgit:7335 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7344 +#: ../dgit:7355 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7410 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7414 +#: ../dgit:7425 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7418 +#: ../dgit:7429 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7424 +#: ../dgit:7435 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1994,44 +1984,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7452 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7454 +#: ../dgit:7465 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7474 +#: ../dgit:7485 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7484 +#: ../dgit:7495 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7489 +#: ../dgit:7500 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7500 +#: ../dgit:7511 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7521 +#: ../dgit:7532 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7522 +#: ../dgit:7533 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7541 +#: ../dgit:7552 #, perl-format msgid "unknown operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 840de39..05475eb 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 16:59+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 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" +"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:241 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:247 +#: ../dgit:248 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:255 +#: ../dgit:256 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:260 +#: ../dgit:261 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:483 +#: ../dgit:484 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:488 ../dgit:494 +#: ../dgit:489 ../dgit:495 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:489 +#: ../dgit:490 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:497 +#: ../dgit:498 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:504 +#: ../dgit:505 msgid "protocol message" msgstr "" -#: ../dgit:512 +#: ../dgit:513 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:533 +#: ../dgit:534 msgid "bad byte count" msgstr "" -#: ../dgit:536 +#: ../dgit:537 msgid "data block" msgstr "" -#: ../dgit:617 +#: ../dgit:618 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:629 +#: ../dgit:630 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:631 +#: ../dgit:632 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:656 +#: ../dgit:657 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:676 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:679 +#: ../dgit:680 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:684 +#: ../dgit:685 msgid "too few arguments" msgstr "" -#: ../dgit:795 +#: ../dgit:796 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:798 +#: ../dgit:799 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:818 +#: ../dgit:819 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:859 +#: ../dgit:860 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:874 +#: ../dgit:875 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:890 +#: ../dgit:891 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:910 +#: ../dgit:911 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:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:921 +#: ../dgit:922 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:925 +#: ../dgit:926 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:1091 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1136 +#: ../dgit:1137 #, 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:1158 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1165 +#: ../dgit:1166 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1169 +#: ../dgit:1170 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1185 +#: ../dgit:1186 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1189 +#: ../dgit:1190 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1191 +#: ../dgit:1192 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1193 +#: ../dgit:1194 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1196 ../dgit:1221 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1209 +#: ../dgit:1210 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1211 +#: ../dgit:1212 msgid "bad component" msgstr "" -#: ../dgit:1214 +#: ../dgit:1215 msgid "bad filename" msgstr "" -#: ../dgit:1216 +#: ../dgit:1217 msgid "bad sha256sum" msgstr "" -#: ../dgit:1267 +#: ../dgit:1268 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1351 +#: ../dgit:1352 #, 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:1374 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1401 +#: ../dgit:1402 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1402 +#: ../dgit:1403 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1507 +#: ../dgit:1508 #, 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:1699 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1701 +#: ../dgit:1702 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1703 +#: ../dgit:1704 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1723 +#: ../dgit:1724 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1730 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1756 +#: ../dgit:1757 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1773 +#: ../dgit:1774 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1788 +#: ../dgit:1789 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1803 +#: ../dgit:1804 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1841 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1886 +#: ../dgit:1887 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1897 +#: ../dgit:1898 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1943 +#: ../dgit:1944 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1952 +#: ../dgit:1953 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1956 +#: ../dgit:1957 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1962 +#: ../dgit:1963 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2002 +#: ../dgit:2003 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2015 +#: ../dgit:2016 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2028 +#: ../dgit:2029 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2044 +#: ../dgit:2045 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2049 +#: ../dgit:2050 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2057 +#: ../dgit:2058 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2064 +#: ../dgit:2065 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2092 +#: ../dgit:2093 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2103 +#: ../dgit:2104 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2127 +#: ../dgit:2128 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2150 +#: ../dgit:2151 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +445,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2162 +#: ../dgit:2163 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2193 +#: ../dgit:2194 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2195 +#: ../dgit:2196 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2197 +#: ../dgit:2198 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2202 +#: ../dgit:2203 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2228 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2232 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2236 +#: ../dgit:2237 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2246 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2249 +#: ../dgit:2250 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2252 +#: ../dgit:2253 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2291 ../dgit:2296 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2311 ../dgit:2318 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2382 +#: ../dgit:2383 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2447 ../dgit:5971 msgid "source package" msgstr "" -#: ../dgit:2464 +#: ../dgit:2465 msgid "package changelog" msgstr "" -#: ../dgit:2504 +#: ../dgit:2505 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2523 +#: ../dgit:2524 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2604 +#: ../dgit:2605 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2623 +#: ../dgit:2624 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2632 +#: ../dgit:2633 #, 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:2648 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2651 +#: ../dgit:2652 msgid "Import of source package" msgstr "" -#: ../dgit:2664 +#: ../dgit:2665 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2668 +#: ../dgit:2669 #, perl-format msgid "" "\n" @@ -560,51 +583,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2710 +#: ../dgit:2711 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2714 +#: ../dgit:2715 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2718 +#: ../dgit:2719 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2734 +#: ../dgit:2735 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2829 +#: ../dgit:2830 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2844 +#: ../dgit:2845 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2888 +#: ../dgit:2889 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2903 +#: ../dgit:2904 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:2909 #, 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:2976 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3024 +#: ../dgit:3025 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3028 +#: ../dgit:3029 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3035 +#: ../dgit:3036 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3037 +#: ../dgit:3038 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3059 +#: ../dgit:3060 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3064 +#: ../dgit:3065 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3069 +#: ../dgit:3070 #, 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:3080 #, 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:3100 msgid "rewrite map" msgstr "" -#: ../dgit:3106 +#: ../dgit:3107 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3110 +#: ../dgit:3111 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3112 +#: ../dgit:3113 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3119 +#: ../dgit:3120 msgid "additional commits" msgstr "" -#: ../dgit:3122 +#: ../dgit:3123 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3147 +#: ../dgit:3148 msgid "last upload to archive" msgstr "" -#: ../dgit:3151 +#: ../dgit:3152 msgid "no version available from the archive" msgstr "" -#: ../dgit:3234 +#: ../dgit:3235 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3241 +#: ../dgit:3242 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3246 +#: ../dgit:3247 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3274 +#: ../dgit:3275 #, perl-format msgid "" "\n" @@ -722,15 +745,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3287 +#: ../dgit:3288 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3290 +#: ../dgit:3291 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3311 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -738,7 +761,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3320 +#: ../dgit:3321 #, perl-format msgid "" "\n" @@ -748,7 +771,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3405 +#: ../dgit:3406 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +779,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3418 +#: ../dgit:3419 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3436 +#: ../dgit:3437 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3438 +#: ../dgit:3439 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3449 +#: ../dgit:3450 #, perl-format msgid "" "\n" @@ -778,30 +801,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3464 +#: ../dgit:3465 msgid "fetched source tree" msgstr "" -#: ../dgit:3500 +#: ../dgit:3501 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3565 +#: ../dgit:3566 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3579 +#: ../dgit:3580 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3594 +#: ../dgit:3595 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3621 +#: ../dgit:3622 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +832,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3643 +#: ../dgit:3644 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3651 +#: ../dgit:3652 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3690 +#: ../dgit:3691 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3722 +#: ../dgit:3723 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3724 +#: ../dgit:3725 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3763 +#: ../dgit:3764 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +863,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3777 +#: ../dgit:3778 msgid "" "\n" "Key\n" @@ -849,248 +872,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3792 +#: ../dgit:3793 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3810 +#: ../dgit:3811 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3818 +#: ../dgit:3819 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3833 +#: ../dgit:3834 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3849 +#: ../dgit:3850 msgid "fetching existing git history" msgstr "" -#: ../dgit:3853 +#: ../dgit:3854 msgid "starting new git history" msgstr "" -#: ../dgit:3879 +#: ../dgit:3880 #, 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:3885 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3896 +#: ../dgit:3897 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3898 +#: ../dgit:3899 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3906 +#: ../dgit:3907 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3917 +#: ../dgit:3918 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3936 +#: ../dgit:3937 #, 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:3954 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3956 +#: ../dgit:3957 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3960 +#: ../dgit:3961 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4003 +#: ../dgit:4004 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4008 +#: ../dgit:4009 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4018 +#: ../dgit:4019 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4024 +#: ../dgit:4025 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4053 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4061 +#: ../dgit:4062 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4070 +#: ../dgit:4071 msgid "version currently in archive" msgstr "" -#: ../dgit:4079 +#: ../dgit:4080 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4087 +#: ../dgit:4088 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4097 +#: ../dgit:4098 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4100 +#: ../dgit:4101 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4114 +#: ../dgit:4115 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4170 +#: ../dgit:4171 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4179 +#: ../dgit:4180 msgid "maintainer view tag" msgstr "" -#: ../dgit:4181 +#: ../dgit:4182 msgid "dgit view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4183 msgid "current archive contents" msgstr "" -#: ../dgit:4195 +#: ../dgit:4196 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4205 +#: ../dgit:4206 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4207 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4211 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4223 +#: ../dgit:4224 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4231 +#: ../dgit:4232 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4243 +#: ../dgit:4244 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4265 +#: ../dgit:4266 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4326 +#: ../dgit:4327 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4354 +#: ../dgit:4355 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4367 +#: ../dgit:4368 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4419 +#: ../dgit:4420 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:4429 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4433 +#: ../dgit:4434 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:4457 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4473 +#: ../dgit:4474 #, 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:4498 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4528 +#: ../dgit:4529 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:4539 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4573 ../dgit:4585 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4578 +#: ../dgit:4579 #, 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:4589 #, 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:4600 #, 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:4622 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4625 +#: ../dgit:4626 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4629 +#: ../dgit:4630 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4636 +#: ../dgit:4637 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4680 +#: ../dgit:4681 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:4694 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:4711 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:4728 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:4759 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4770 +#: ../dgit:4771 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4781 +#: ../dgit:4782 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4788 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4801 +#: ../dgit:4802 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4805 +#: ../dgit:4806 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4843 +#: ../dgit:4844 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4860 +#: ../dgit:4861 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4870 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4931 +#: ../dgit:4932 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4934 +#: ../dgit:4935 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4936 +#: ../dgit:4937 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4941 +#: ../dgit:4942 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4956 +#: ../dgit:4957 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4967 +#: ../dgit:4968 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5005 +#: ../dgit:5006 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5085 +#: ../dgit:5086 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5122 +#: ../dgit:5123 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5125 +#: ../dgit:5126 msgid "all done\n" msgstr "" -#: ../dgit:5134 +#: ../dgit:5135 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5142 +#: ../dgit:5143 msgid "bad param spec" msgstr "" -#: ../dgit:5148 +#: ../dgit:5149 msgid "bad previously spec" msgstr "" -#: ../dgit:5167 +#: ../dgit:5168 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5212 +#: ../dgit:5213 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5215 +#: ../dgit:5216 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5256 +#: ../dgit:5257 msgid "remote changes file" msgstr "" -#: ../dgit:5331 +#: ../dgit:5332 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5337 +#: ../dgit:5338 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5339 msgid "modified symlink\n" msgstr "" -#: ../dgit:5341 +#: ../dgit:5342 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5345 +#: ../dgit:5346 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5375 +#: ../dgit:5376 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5404 +#: ../dgit:5405 #, perl-format msgid "" "\n" @@ -1349,31 +1372,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5411 +#: ../dgit:5412 #, 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:5418 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5424 +#: ../dgit:5425 #, 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:5432 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5440 +#: ../dgit:5441 #, 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:5450 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5454 +#: ../dgit:5455 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5459 +#: ../dgit:5460 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:5482 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5495 +#: ../dgit:5496 msgid "converted" msgstr "" -#: ../dgit:5496 +#: ../dgit:5497 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5561 +#: ../dgit:5562 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5579 +#: ../dgit:5580 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5588 +#: ../dgit:5589 msgid "root commit" msgstr "" -#: ../dgit:5594 +#: ../dgit:5595 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5606 +#: ../dgit:5607 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5625 +#: ../dgit:5626 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5632 +#: ../dgit:5633 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5644 +#: ../dgit:5645 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5647 +#: ../dgit:5648 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5659 +#: ../dgit:5660 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1486,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5666 +#: ../dgit:5667 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5700 +#: ../dgit:5701 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5701 +#: ../dgit:5702 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5703 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5704 msgid "is series file\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5705 msgid "too long\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5709 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5737 +#: ../dgit:5738 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5880 +#: ../dgit:5881 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5890 +#: ../dgit:5891 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5992 +#: ../dgit:5993 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6023 +#: ../dgit:6024 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6028 +#: ../dgit:6029 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6039 +#: ../dgit:6040 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6130 +#: ../dgit:6131 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:6145 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6181 +#: ../dgit:6182 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6184 +#: ../dgit:6185 #, 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:6191 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6194 +#: ../dgit:6195 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6201 +#: ../dgit:6202 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6204 +#: ../dgit:6205 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6207 +#: ../dgit:6208 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6210 +#: ../dgit:6211 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6214 +#: ../dgit:6215 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6223 +#: ../dgit:6224 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6262 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1615,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6273 +#: ../dgit:6274 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6302 +#: ../dgit:6303 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:6315 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6317 +#: ../dgit:6318 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6320 +#: ../dgit:6321 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6338 +#: ../dgit:6339 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6352 +#: ../dgit:6353 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6365 +#: ../dgit:6366 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6404 +#: ../dgit:6405 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6406 +#: ../dgit:6407 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6432 +#: ../dgit:6433 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6438 +#: ../dgit:6439 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6441 +#: ../dgit:6442 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6484 +#: ../dgit:6485 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6522 +#: ../dgit:6523 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6529 +#: ../dgit:6530 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6536 +#: ../dgit:6537 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6540 +#: ../dgit:6541 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6545 +#: ../dgit:6546 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6548 +#: ../dgit:6549 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6561 +#: ../dgit:6562 #, 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:6580 msgid "build successful\n" msgstr "" -#: ../dgit:6586 +#: ../dgit:6587 #, 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:6697 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6731 +#: ../dgit:6732 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6751 +#: ../dgit:6752 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6764 +#: ../dgit:6765 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6768 +#: ../dgit:6769 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6775 +#: ../dgit:6776 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6781 +#: ../dgit:6782 msgid "source changes file" msgstr "" -#: ../dgit:6783 +#: ../dgit:6784 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6804 ../dgit:6806 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6818 +#: ../dgit:6819 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:6831 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:6835 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:6865 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6886 +#: ../dgit:6887 msgid "source tree" msgstr "" -#: ../dgit:6888 +#: ../dgit:6889 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6901 +#: ../dgit:6902 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6905 +#: ../dgit:6906 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6909 +#: ../dgit:6910 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6926 +#: ../dgit:6927 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6931 +#: ../dgit:6932 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6933 +#: ../dgit:6934 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6944 +#: ../dgit:6945 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6947 +#: ../dgit:6948 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6958 +#: ../dgit:6959 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6969 +#: ../dgit:6970 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6978 +#: ../dgit:6979 #, 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:6986 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6987 +#: ../dgit:6988 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6992 +#: ../dgit:6993 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6997 +#: ../dgit:6998 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,139 +1877,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7009 +#: ../dgit:7016 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7011 +#: ../dgit:7018 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7019 +#: ../dgit:7037 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7023 -#, perl-format -msgid "import %s requires .../%s, but it does not exist" -msgstr "" - -#: ../dgit:7028 -#, perl-format -msgid "import %s requires %s, but: %s" -msgstr "" - -#: ../dgit:7030 +#: ../dgit:7041 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7042 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7053 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7044 +#: ../dgit:7055 msgid "Import, merging." msgstr "" -#: ../dgit:7058 +#: ../dgit:7069 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7067 +#: ../dgit:7078 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7074 +#: ../dgit:7085 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7080 +#: ../dgit:7091 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7094 +#: ../dgit:7105 msgid "need destination argument" msgstr "" -#: ../dgit:7099 +#: ../dgit:7110 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7107 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7118 +#: ../dgit:7129 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7124 +#: ../dgit:7135 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7142 ../dgit:7148 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7143 +#: ../dgit:7154 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7190 +#: ../dgit:7201 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7229 +#: ../dgit:7240 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7233 +#: ../dgit:7244 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7324 +#: ../dgit:7335 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7344 +#: ../dgit:7355 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7410 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7414 +#: ../dgit:7425 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7418 +#: ../dgit:7429 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7424 +#: ../dgit:7435 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1994,44 +2007,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7452 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7454 +#: ../dgit:7465 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7474 +#: ../dgit:7485 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7484 +#: ../dgit:7495 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7489 +#: ../dgit:7500 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7500 +#: ../dgit:7511 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7521 +#: ../dgit:7532 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7522 +#: ../dgit:7533 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7541 +#: ../dgit:7552 #, perl-format msgid "unknown operation %s" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -19,79 +19,79 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:240 +#: ../dgit:241 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:247 +#: ../dgit:248 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:255 +#: ../dgit:256 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:260 +#: ../dgit:261 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: broncodepakket %s bestaat niet in suite %s\n" -#: ../dgit:483 +#: ../dgit:484 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:488 ../dgit:494 +#: ../dgit:489 ../dgit:495 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:489 +#: ../dgit:490 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:497 +#: ../dgit:498 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:504 +#: ../dgit:505 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:512 +#: ../dgit:513 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:533 +#: ../dgit:534 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:536 +#: ../dgit:537 msgid "data block" msgstr "gegevensblok" -#: ../dgit:617 +#: ../dgit:618 #, perl-format msgid "failed to fetch %s: %s" msgstr "ophalen (fetch) van %s mislukt: %s" -#: ../dgit:629 +#: ../dgit:630 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:631 +#: ../dgit:632 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:656 +#: ../dgit:657 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -131,13 +131,13 @@ msgstr "" " -c<naam>=<waarde> configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:675 +#: ../dgit:676 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" "Misschien zit de upload vast in incoming. De versie van git wordt " "gebruikt.\n" -#: ../dgit:679 +#: ../dgit:680 #, perl-format msgid "" "%s: %s\n" @@ -146,22 +146,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:684 +#: ../dgit:685 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:795 +#: ../dgit:796 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:798 +#: ../dgit:799 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" "waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!" -#: ../dgit:818 +#: ../dgit:819 #, perl-format msgid "" "need value for one of: %s\n" @@ -170,39 +170,39 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:859 +#: ../dgit:860 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" "slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)" -#: ../dgit:874 +#: ../dgit:875 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:890 +#: ../dgit:891 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'" -#: ../dgit:910 +#: ../dgit:911 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" "alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een " "(auto)" -#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:920 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "interne fout" -#: ../dgit:921 +#: ../dgit:922 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:925 +#: ../dgit:926 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -211,13 +211,13 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1090 +#: ../dgit:1091 msgid "this operation does not support multiple comma-separated suites" msgstr "" "meerdere met een komma van elkaar gescheiden suites worden door deze " "bewerking niet ondersteund" -#: ../dgit:1136 +#: ../dgit:1137 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " @@ -226,68 +226,68 @@ msgstr "" "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl " "ertoe te brengen exact die EE-sleutel (%s) te gebruiken" -#: ../dgit:1157 +#: ../dgit:1158 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1165 +#: ../dgit:1166 msgid "curl failed to print 3-digit HTTP code" msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" -#: ../dgit:1169 +#: ../dgit:1170 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1185 +#: ../dgit:1186 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1189 +#: ../dgit:1190 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1191 +#: ../dgit:1192 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1193 +#: ../dgit:1194 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1196 ../dgit:1221 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1209 +#: ../dgit:1210 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1211 +#: ../dgit:1212 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1214 +#: ../dgit:1215 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1216 +#: ../dgit:1217 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1267 +#: ../dgit:1268 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1351 +#: ../dgit:1352 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -300,21 +300,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1373 +#: ../dgit:1374 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1401 +#: ../dgit:1402 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1402 +#: ../dgit:1403 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1507 +#: ../dgit:1508 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -323,138 +323,138 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1698 +#: ../dgit:1699 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1701 +#: ../dgit:1702 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1703 +#: ../dgit:1704 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1723 +#: ../dgit:1724 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten" -#: ../dgit:1729 +#: ../dgit:1730 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1756 +#: ../dgit:1757 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1773 +#: ../dgit:1774 msgid "unexpected results from git check query - " msgstr "het verzoek git check leverde onverwachte resultaten op - " -#: ../dgit:1788 +#: ../dgit:1789 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1803 +#: ../dgit:1804 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1840 +#: ../dgit:1841 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1886 +#: ../dgit:1887 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1897 +#: ../dgit:1898 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1943 +#: ../dgit:1944 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:1952 +#: ../dgit:1953 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1956 +#: ../dgit:1957 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1962 +#: ../dgit:1963 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2002 +#: ../dgit:2003 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2015 +#: ../dgit:2016 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2028 +#: ../dgit:2029 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2044 +#: ../dgit:2045 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2049 +#: ../dgit:2050 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2057 +#: ../dgit:2058 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2064 +#: ../dgit:2065 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2092 +#: ../dgit:2093 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2100 +#: ../dgit:2101 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2103 +#: ../dgit:2104 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2127 +#: ../dgit:2128 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -463,7 +463,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2150 +#: ../dgit:2151 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -490,7 +490,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2162 +#: ../dgit:2163 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -498,25 +498,24 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2193 +#: ../dgit:2194 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2195 +#: ../dgit:2196 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2197 +#: ../dgit:2198 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2202 +#: ../dgit:2203 #, perl-format -#| msgid "opendir build-products-dir %s: %s" msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2227 +#: ../dgit:2228 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -524,89 +523,86 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " "overbrengen:\n" -#: ../dgit:2231 +#: ../dgit:2232 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2233 +#: ../dgit:2234 #, perl-format -#| msgid "missing field %s in %s" msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2236 -#, perl-format -msgid "check targe of orig symlink %s in ..: %s" +#: ../dgit:2237 +#, fuzzy, perl-format +#| msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2245 +#: ../dgit:2246 #, perl-format -#| msgid "%s: warning: removing from %s: %s\n" msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2249 +#: ../dgit:2250 #, perl-format -#| msgid "%s: warning: removing from %s: %s\n" msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2252 +#: ../dgit:2253 #, perl-format -#| msgid "failed to mkdir a playground %s: %s" msgid "failed to make %s a hardlink to %s: %s" msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2258 +#: ../dgit:2259 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2291 ../dgit:2296 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2311 ../dgit:2318 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2382 +#: ../dgit:2383 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2447 ../dgit:5971 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2464 +#: ../dgit:2465 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2504 +#: ../dgit:2505 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2523 +#: ../dgit:2524 #, perl-format msgid "Import %s" msgstr "Importeren van %s" -#: ../dgit:2604 +#: ../dgit:2605 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2623 +#: ../dgit:2624 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2632 +#: ../dgit:2633 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -619,21 +615,21 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2647 +#: ../dgit:2648 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2651 +#: ../dgit:2652 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2664 +#: ../dgit:2665 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "Gegeven %s (%s) uit archiefsuite %s\n" -#: ../dgit:2668 +#: ../dgit:2669 #, perl-format msgid "" "\n" @@ -646,12 +642,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2710 +#: ../dgit:2711 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2714 +#: ../dgit:2715 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -660,12 +656,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2718 +#: ../dgit:2719 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2734 +#: ../dgit:2735 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -673,24 +669,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2829 +#: ../dgit:2830 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2844 +#: ../dgit:2845 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" "waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt " "genegeerd.\n" -#: ../dgit:2888 +#: ../dgit:2889 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" "waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n" -#: ../dgit:2903 +#: ../dgit:2904 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" @@ -700,7 +696,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run.\n" -#: ../dgit:2908 +#: ../dgit:2909 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -716,44 +712,44 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2975 +#: ../dgit:2976 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" -#: ../dgit:3024 +#: ../dgit:3025 #, perl-format msgid "%s: NO git hash" msgstr "%s: GEEN hash van git" -#: ../dgit:3028 +#: ../dgit:3029 #, perl-format msgid "%s: specified git info (%s)" msgstr "%s: git info werd opgegeven (%s)" -#: ../dgit:3035 +#: ../dgit:3036 #, perl-format msgid "%s: specified git hash" msgstr "%s: git hash werd opgegeven" -#: ../dgit:3037 +#: ../dgit:3038 #, perl-format msgid "%s: invalid Dgit info" msgstr "%s: ongeldige Dgit info" -#: ../dgit:3059 +#: ../dgit:3060 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" "ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet " "gehaald" -#: ../dgit:3064 +#: ../dgit:3065 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3069 +#: ../dgit:3070 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -762,7 +758,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3079 +#: ../dgit:3080 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -775,30 +771,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3099 +#: ../dgit:3100 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3106 +#: ../dgit:3107 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" "het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat " "een relevant element!" -#: ../dgit:3110 +#: ../dgit:3111 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3112 +#: ../dgit:3113 msgid "server data says .dsc hash is to be disregarded" msgstr "" "de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden" -#: ../dgit:3119 +#: ../dgit:3120 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3122 +#: ../dgit:3123 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -807,27 +803,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3147 +#: ../dgit:3148 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3151 +#: ../dgit:3152 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3234 +#: ../dgit:3235 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3241 +#: ../dgit:3242 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3246 +#: ../dgit:3247 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3274 +#: ../dgit:3275 #, perl-format msgid "" "\n" @@ -843,15 +839,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3287 +#: ../dgit:3288 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3290 +#: ../dgit:3291 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3311 +#: ../dgit:3312 #, perl-format msgid "" "\n" @@ -863,7 +859,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3320 +#: ../dgit:3321 #, perl-format msgid "" "\n" @@ -878,7 +874,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3405 +#: ../dgit:3406 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -889,19 +885,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3418 +#: ../dgit:3419 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3436 +#: ../dgit:3437 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3438 +#: ../dgit:3439 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3449 +#: ../dgit:3450 #, perl-format msgid "" "\n" @@ -917,15 +913,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3464 +#: ../dgit:3465 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3500 +#: ../dgit:3501 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3565 +#: ../dgit:3566 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -933,16 +929,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3579 +#: ../dgit:3580 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n" -#: ../dgit:3594 +#: ../dgit:3595 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3621 +#: ../dgit:3622 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -953,32 +949,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3643 +#: ../dgit:3644 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3651 +#: ../dgit:3652 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3690 +#: ../dgit:3691 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3722 +#: ../dgit:3723 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3724 +#: ../dgit:3725 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" "het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt " "voorop!" -#: ../dgit:3763 +#: ../dgit:3764 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -989,7 +985,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3777 +#: ../dgit:3778 msgid "" "\n" "Key\n" @@ -1003,34 +999,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3792 +#: ../dgit:3793 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3810 +#: ../dgit:3811 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3818 +#: ../dgit:3819 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3833 +#: ../dgit:3834 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3849 +#: ../dgit:3850 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3853 +#: ../dgit:3854 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3879 +#: ../dgit:3880 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -1040,33 +1036,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3884 +#: ../dgit:3885 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3896 +#: ../dgit:3897 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3898 +#: ../dgit:3899 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3906 +#: ../dgit:3907 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3917 +#: ../dgit:3918 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:3936 +#: ../dgit:3937 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1075,15 +1071,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:3953 +#: ../dgit:3954 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3956 +#: ../dgit:3957 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3960 +#: ../dgit:3961 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1091,7 +1087,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4003 +#: ../dgit:4004 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1099,60 +1095,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4008 +#: ../dgit:4009 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4018 +#: ../dgit:4019 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4024 +#: ../dgit:4025 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4050 +#: ../dgit:4051 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4053 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4061 +#: ../dgit:4062 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" "%s (%s) .. %s (%s) is niet fast forward (geen lineaire " "veranderingsgeschiedenis)\n" -#: ../dgit:4070 +#: ../dgit:4071 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4079 +#: ../dgit:4080 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4087 +#: ../dgit:4088 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4097 +#: ../dgit:4098 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4100 +#: ../dgit:4101 #, perl-format msgid "" "%s is %s\n" @@ -1161,81 +1157,81 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4114 +#: ../dgit:4115 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4170 +#: ../dgit:4171 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4179 +#: ../dgit:4180 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4181 +#: ../dgit:4182 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4182 +#: ../dgit:4183 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4195 +#: ../dgit:4196 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" "| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite " "nodig? Raadpleeg dgit(1).\n" -#: ../dgit:4205 +#: ../dgit:4206 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4206 +#: ../dgit:4207 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4210 +#: ../dgit:4211 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4223 +#: ../dgit:4224 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4231 +#: ../dgit:4232 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4243 +#: ../dgit:4244 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4265 +#: ../dgit:4266 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "%s is voor %s %s maar debian/changelog is voor %s %s" -#: ../dgit:4326 +#: ../dgit:4327 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog" -#: ../dgit:4354 +#: ../dgit:4355 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "%s release %s voor %s (%s) [dgit]\n" -#: ../dgit:4367 +#: ../dgit:4368 #, perl-format msgid "" "%s release %s for %s (%s)\n" @@ -1244,7 +1240,7 @@ msgstr "" "%s release %s voor %s (%s)\n" "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4419 +#: ../dgit:4420 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1253,14 +1249,14 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4428 +#: ../dgit:4429 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, " "gebruik dan --new" -#: ../dgit:4433 +#: ../dgit:4434 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1269,12 +1265,12 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4456 +#: ../dgit:4457 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen" -#: ../dgit:4473 +#: ../dgit:4474 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1287,7 +1283,7 @@ msgstr "" "Gebruik de juiste --quilt-optie of pas uw git config aan.\n" "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" -#: ../dgit:4497 +#: ../dgit:4498 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1296,7 +1292,7 @@ msgstr "" "--quilt=%s maar geen gecachete dgit-weergave:\n" " werd HEAD misschien gewijzigd sinds dgit build[-source]?" -#: ../dgit:4528 +#: ../dgit:4529 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1309,17 +1305,17 @@ msgstr "" "Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " "u --deliberately-not-fast-forward." -#: ../dgit:4538 +#: ../dgit:4539 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "bezig na te gaan dat %s overeenkomt met HEAD" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4573 ../dgit:4585 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "HEAD geeft een andere boom op aan %s:\n" -#: ../dgit:4578 +#: ../dgit:4579 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" @@ -1328,7 +1324,7 @@ msgstr "" "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n" "Om alle verschillen te zien, gebruikt u git diff %s %s\n" -#: ../dgit:4588 +#: ../dgit:4589 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1340,7 +1336,7 @@ msgstr "" "zien,\n" " gebruikt u git diff %s %s\n" -#: ../dgit:4599 +#: ../dgit:4600 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1349,19 +1345,19 @@ msgstr "" "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " "u dgit -C gebruiken" -#: ../dgit:4621 +#: ../dgit:4622 msgid "uploading binaries, although distro policy is source only" msgstr "" "bezig met uploaden van binaire pakketten, hoewel het beleid van de " "distributie uitsluitend broncode (source only) voorschrijft" -#: ../dgit:4625 +#: ../dgit:4626 msgid "source-only upload, although distro policy requires .debs" msgstr "" "upload van uitsluitend broncode (source-only), hoewel het beleid van de " "distributie .deb's vereist" -#: ../dgit:4629 +#: ../dgit:4630 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" @@ -1371,12 +1367,12 @@ msgstr "" "is\n" "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" -#: ../dgit:4636 +#: ../dgit:4637 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" -#: ../dgit:4680 +#: ../dgit:4681 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1385,7 +1381,7 @@ msgstr "" "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " "probleem.\n" -#: ../dgit:4693 +#: ../dgit:4694 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1394,7 +1390,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4710 +#: ../dgit:4711 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" @@ -1404,7 +1400,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4727 +#: ../dgit:4728 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" @@ -1422,84 +1418,84 @@ msgstr "" "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4758 +#: ../dgit:4759 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:4770 +#: ../dgit:4771 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als " "argument" -#: ../dgit:4781 +#: ../dgit:4782 msgid "incorrect arguments to dgit clone" msgstr "incorrecte argumenten voor dgit clone" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4788 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:4801 +#: ../dgit:4802 #, perl-format msgid "remove %s: %s\n" msgstr "verwijder %s: %s\n" -#: ../dgit:4805 +#: ../dgit:4806 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleer of %s moet verwijderd worden: %s\n" -#: ../dgit:4843 +#: ../dgit:4844 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "incorrecte argumenten voor dgit fetch of dgit pull" -#: ../dgit:4860 +#: ../dgit:4861 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet " "ondersteund\n" -#: ../dgit:4869 +#: ../dgit:4870 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout heeft een suite nodig als argument" -#: ../dgit:4931 +#: ../dgit:4932 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "bezig met opzetten van vcs-git: %s\n" -#: ../dgit:4934 +#: ../dgit:4935 #, perl-format msgid "vcs git already configured: %s\n" msgstr "vcs git is reeds geconfigureerd: %s\n" -#: ../dgit:4936 +#: ../dgit:4937 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "url van vcs-git wordt veranderd naar: %s\n" -#: ../dgit:4941 +#: ../dgit:4942 #, perl-format msgid "fetching (%s)\n" msgstr "bezig met ophalen (%s)\n" -#: ../dgit:4956 +#: ../dgit:4957 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "incorrecte argumenten voor dgit %s" -#: ../dgit:4967 +#: ../dgit:4968 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel " "wordt %s opgegeven" -#: ../dgit:5005 +#: ../dgit:5006 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1507,34 +1503,34 @@ msgstr "" "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " "de aanroepende computer zijn %s" -#: ../dgit:5085 +#: ../dgit:5086 #, perl-format msgid "create %s: %s" msgstr "maak %s aan: %s" -#: ../dgit:5122 +#: ../dgit:5123 #, perl-format msgid "build host child failed: %s" msgstr "dochterproces op de bouwcomputer faalde: %s" -#: ../dgit:5125 +#: ../dgit:5126 msgid "all done\n" msgstr "alles klaar\n" -#: ../dgit:5134 +#: ../dgit:5135 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5142 +#: ../dgit:5143 msgid "bad param spec" msgstr "slechte parameter-spec" -#: ../dgit:5148 +#: ../dgit:5149 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5167 +#: ../dgit:5168 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" @@ -1542,45 +1538,45 @@ msgstr "" "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " "%s niet ondersteunt" -#: ../dgit:5212 +#: ../dgit:5213 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "buildinfo-incongruentie in veld %s" -#: ../dgit:5215 +#: ../dgit:5216 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "buildinfo bevat ongeoorloofd veld %s" -#: ../dgit:5256 +#: ../dgit:5257 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5331 +#: ../dgit:5332 msgid "not a plain file or symlink\n" msgstr "geen echt bestand of symbolische koppeling\n" -#: ../dgit:5337 +#: ../dgit:5338 msgid "mode or type changed\n" msgstr "modus of type gewijzigd\n" -#: ../dgit:5338 +#: ../dgit:5339 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5341 +#: ../dgit:5342 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5345 +#: ../dgit:5346 msgid "creation with non-default mode\n" msgstr "creatie met een niet-standaard modus\n" -#: ../dgit:5375 +#: ../dgit:5376 msgid "dgit view: changes are required..." msgstr "dgit-weergave: er zijn wijzigingen vereist..." -#: ../dgit:5404 +#: ../dgit:5405 #, perl-format msgid "" "\n" @@ -1591,7 +1587,7 @@ msgstr "" "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" " %s\n" -#: ../dgit:5411 +#: ../dgit:5412 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1601,7 +1597,7 @@ msgstr "" " (een git-boom zonder dat de patches toegepast worden)\n" " maar de git-boom verschilt van orig in de toeleveraarsbestanden." -#: ../dgit:5417 +#: ../dgit:5418 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1610,7 +1606,7 @@ msgstr "" " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" "wachtrij?" -#: ../dgit:5424 +#: ../dgit:5425 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1621,12 +1617,12 @@ msgstr "" " maar de git-boom verschilt van het resultaat van het toepassen van\n" " debian/patches op de broncode van de toeleveraar.\n" -#: ../dgit:5431 +#: ../dgit:5432 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" -#: ../dgit:5440 +#: ../dgit:5441 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1637,20 +1633,20 @@ msgstr "" " te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n" " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n" -#: ../dgit:5449 +#: ../dgit:5450 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " "representeren" -#: ../dgit:5454 +#: ../dgit:5455 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op " "te tekenen" -#: ../dgit:5459 +#: ../dgit:5460 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1665,43 +1661,43 @@ msgstr "" "gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n" "de weergave van het pakket uit het officiële Debian-archief.\n" -#: ../dgit:5481 +#: ../dgit:5482 msgid "Commit patch to update .gitignore\n" msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" -#: ../dgit:5495 +#: ../dgit:5496 msgid "converted" msgstr "omgezet" -#: ../dgit:5496 +#: ../dgit:5497 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5561 +#: ../dgit:5562 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5579 +#: ../dgit:5580 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5588 +#: ../dgit:5589 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5594 +#: ../dgit:5595 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5606 +#: ../dgit:5607 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5625 +#: ../dgit:5626 #, perl-format msgid "" "\n" @@ -1710,23 +1706,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5632 +#: ../dgit:5633 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5644 +#: ../dgit:5645 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" "lineair maken van de quilt-geschiedenis mislukte. Zoek naar `quilt fixup' in " "dgit(7).\n" -#: ../dgit:5647 +#: ../dgit:5648 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5659 +#: ../dgit:5660 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1737,72 +1733,72 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5666 +#: ../dgit:5667 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5700 +#: ../dgit:5701 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5701 +#: ../dgit:5702 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5702 +#: ../dgit:5703 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5703 +#: ../dgit:5704 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5704 +#: ../dgit:5705 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5708 +#: ../dgit:5709 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" "quiltifying commit (quiltificerende vastlegging) %s: Gbp-Pq %s wordt " "genegeerd/weggelaten: %s" -#: ../dgit:5737 +#: ../dgit:5738 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5880 +#: ../dgit:5881 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5890 +#: ../dgit:5891 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5992 +#: ../dgit:5993 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" "dgit: gespleten brein (aparte dgit-weergave) is mogelijk nodig (--quilt=%s)." -#: ../dgit:6023 +#: ../dgit:6024 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6028 +#: ../dgit:6029 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6039 +#: ../dgit:6040 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6130 +#: ../dgit:6131 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" @@ -1816,16 +1812,16 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6144 +#: ../dgit:6145 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6181 +#: ../dgit:6182 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "%s: van de basisbomen zijn orig=%.20s en o+d/p=%.20s" -#: ../dgit:6184 +#: ../dgit:6185 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1834,49 +1830,49 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: HEAD %s o+d/p HEAD %s o+d/p" -#: ../dgit:6190 +#: ../dgit:6191 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6194 +#: ../dgit:6195 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" "HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " "kunnen worden\n" -#: ../dgit:6201 +#: ../dgit:6202 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6204 +#: ../dgit:6205 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6207 +#: ../dgit:6208 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" "Heeft u mogelijk een van de volgende opties nodig: --[quilt=]gbp --" "[quilt=]dpm --quilt=unapplied ?" -#: ../dgit:6210 +#: ../dgit:6211 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6214 +#: ../dgit:6215 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" "Is/zijn het/de orig-tararchie(f)(ven) misschien niet identiek aan de " "representatie ervan door git?" -#: ../dgit:6223 +#: ../dgit:6224 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6261 +#: ../dgit:6262 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1891,13 +1887,13 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6273 +#: ../dgit:6274 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" "dgit: Bezig toepassen van patches terug ongedaan te maken om de boom op te " "schonen." -#: ../dgit:6302 +#: ../dgit:6303 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" @@ -1909,18 +1905,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6314 +#: ../dgit:6315 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6317 +#: ../dgit:6318 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (NB dgit voerde geen rules clean " "uit)" -#: ../dgit:6320 +#: ../dgit:6321 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." @@ -1928,80 +1924,80 @@ msgstr "" "de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n" "U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen." -#: ../dgit:6338 +#: ../dgit:6339 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6352 +#: ../dgit:6353 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6365 +#: ../dgit:6366 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "-p is niet toegestaan met dgit %s" -#: ../dgit:6404 +#: ../dgit:6405 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6406 +#: ../dgit:6407 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6432 +#: ../dgit:6433 msgid "archive query failed (queried because --since-version not specified)" msgstr "" "mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet " "opgegeven werd)" -#: ../dgit:6438 +#: ../dgit:6439 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6441 +#: ../dgit:6442 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6484 +#: ../dgit:6485 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6522 +#: ../dgit:6523 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6529 +#: ../dgit:6530 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6536 +#: ../dgit:6537 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6540 +#: ../dgit:6541 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6545 +#: ../dgit:6546 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6548 +#: ../dgit:6549 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6561 +#: ../dgit:6562 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2013,11 +2009,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6579 +#: ../dgit:6580 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6586 +#: ../dgit:6587 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2028,30 +2024,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6696 +#: ../dgit:6697 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6731 +#: ../dgit:6732 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6751 +#: ../dgit:6752 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6764 +#: ../dgit:6765 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6768 +#: ../dgit:6769 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6775 +#: ../dgit:6776 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2059,21 +2055,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6781 +#: ../dgit:6782 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6783 +#: ../dgit:6784 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6804 ../dgit:6806 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6818 +#: ../dgit:6819 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" @@ -2082,7 +2078,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6830 +#: ../dgit:6831 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2090,7 +2086,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6834 +#: ../dgit:6835 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2099,65 +2095,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6864 +#: ../dgit:6865 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6886 +#: ../dgit:6887 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6888 +#: ../dgit:6889 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6901 +#: ../dgit:6902 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6905 +#: ../dgit:6906 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6909 +#: ../dgit:6910 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6926 +#: ../dgit:6927 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6931 +#: ../dgit:6932 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6933 +#: ../dgit:6934 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6944 +#: ../dgit:6945 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6947 +#: ../dgit:6948 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6958 +#: ../dgit:6959 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6969 +#: ../dgit:6970 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "dgit: import-dsc van .dsc met Dgit-veld, met behulp van git hash" -#: ../dgit:6978 +#: ../dgit:6979 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2168,21 +2164,21 @@ msgstr "" "Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n" "server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n" -#: ../dgit:6985 +#: ../dgit:6986 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6987 +#: ../dgit:6988 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6992 +#: ../dgit:6993 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:6997 +#: ../dgit:6998 #, perl-format msgid "" "Branch %s already exists\n" @@ -2194,98 +2190,88 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7009 +#: ../dgit:7016 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7011 +#: ../dgit:7018 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7019 +#: ../dgit:7037 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!" -#: ../dgit:7023 -#, perl-format -msgid "import %s requires .../%s, but it does not exist" -msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" - -#: ../dgit:7028 -#, perl-format -msgid "import %s requires %s, but: %s" -msgstr "importeren van %s vereist %s, maar: %s" - -#: ../dgit:7030 +#: ../dgit:7041 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7031 +#: ../dgit:7042 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7042 +#: ../dgit:7053 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7044 +#: ../dgit:7055 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7058 +#: ../dgit:7069 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7067 +#: ../dgit:7078 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7074 +#: ../dgit:7085 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7080 +#: ../dgit:7091 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7094 +#: ../dgit:7105 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7099 +#: ../dgit:7110 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7107 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url" -#: ../dgit:7118 +#: ../dgit:7129 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7124 +#: ../dgit:7135 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7142 ../dgit:7148 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7143 +#: ../dgit:7154 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7190 +#: ../dgit:7201 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2293,42 +2279,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7229 +#: ../dgit:7240 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7233 +#: ../dgit:7244 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7324 +#: ../dgit:7335 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7344 +#: ../dgit:7355 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7399 +#: ../dgit:7410 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7414 +#: ../dgit:7425 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n" -#: ../dgit:7418 +#: ../dgit:7429 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7424 +#: ../dgit:7435 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2339,48 +2325,48 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7441 +#: ../dgit:7452 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7454 +#: ../dgit:7465 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7474 +#: ../dgit:7485 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7484 +#: ../dgit:7495 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7489 +#: ../dgit:7500 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" "dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " "weergave" -#: ../dgit:7500 +#: ../dgit:7511 #, perl-format msgid "unknown clean-mode `%s'" msgstr "onbekende clean-modus `%s'" -#: ../dgit:7521 +#: ../dgit:7532 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7522 +#: ../dgit:7533 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7541 +#: ../dgit:7552 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -3284,3 +3270,9 @@ msgstr "mkdir van een speelplaats %s mislukte: %s" #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" + +#~ msgid "import %s requires .../%s, but it does not exist" +#~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" + +#~ msgid "import %s requires %s, but: %s" +#~ msgstr "importeren van %s vereist %s, maar: %s" diff --git a/po4a/dgit-downstream-dsc_7.pot b/po4a/dgit-downstream-dsc_7.pot index 3bf1687..d13ce20 100644 --- a/po4a/dgit-downstream-dsc_7.pot +++ b/po4a/dgit-downstream-dsc_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,29 +27,29 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: =item -#: ../dgit.1:1198 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: =item -#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -241,9 +241,9 @@ msgid "" "B<dgit-repos-server> and B<dgit-repos-policy-debian> in the package B<dgit-" "infrastructure>. but in most installations this is not needed. If there is " "no or little distinction between (i) developers who are entitled to upload " -"(push) and (ii) repository administrators, then a it is sufficient to " -"provide a git server with a unix account for each user who will pushing, " -"perhaps using ssh restricted commands." +"(push) and (ii) repository administrators, then it is sufficient to provide " +"a git server with a unix account for each user who will be pushing, perhaps " +"using ssh restricted commands." msgstr "" #. type: =item @@ -407,7 +407,7 @@ msgstr "" #: ../dgit-downstream-dsc.7.pod:217 msgid "" "If you always have a git repository for every package in your archive, " -"perhaps because you never use dput/dupload, and always dgit push, Set C<git-" +"perhaps because you never use dput/dupload, and always dgit push, set C<git-" "check> to B<true>." msgstr "" @@ -564,8 +564,9 @@ msgstr "" #. type: textblock #: ../dgit-downstream-dsc.7.pod:315 msgid "" -"To make ssh restricted command easier, and for the benefit of dgit-repos-" -"server, dgit's ssh commands each start with a parseable commentish rune." +"To make use of ssh restricted command easier, and for the benefit of dgit-" +"repos-server, dgit's ssh commands each start with a parseable commentish " +"rune." msgstr "" #. type: textblock diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index b937feb..71969f4 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,7 +27,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -695,8 +695,8 @@ msgstr "" #: ../dgit-maint-debrebase.7.pod:378 msgid "" "Pass I<--stat> just to see the list of changed files, which is useful to " -"determine whether there are any new or deleted files to may need accounting " -"for in your copyright file." +"determine whether there are any new or deleted files that may need " +"accounting for in your copyright file." msgstr "" #. type: =head1 @@ -815,7 +815,7 @@ msgid "" "last upload, it is not possible for dgit to make your history fast-" "forwarding from the history on B<dgit-repos>. In such cases you will have " "to pass I<--overwrite> to dgit. git-debrebase will normally tell you if " -"this is will be needed." +"this will be needed." msgstr "" #. type: textblock @@ -983,7 +983,7 @@ msgstr "" #. type: textblock #: ../dgit-maint-debrebase.7.pod:562 msgid "" -"If that fails, because your branch and the NMUers work represent divergent " +"If that fails, because your branch and the NMUers' work represent divergent " "branches of development, you have a number of options. Here we describe the " "two simplest." msgstr "" diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index da22681..43d7d51 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -163,7 +163,7 @@ msgstr "" #: ../dgit-maint-native.7.pod:85 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " -"avoid this merge commit by passing C<--deliberately-not-fast-forward>. " +"avoid this merge commit by passing C<--deliberately-not-fast-forward> " "instead of C<--overwrite>. This avoids introducing a new origin commit into " "your git history." msgstr "" diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot index 16d8859..08bc8f7 100644 --- a/po4a/dgit-sponsorship_7.pot +++ b/po4a/dgit-sponsorship_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -65,9 +65,9 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:12 msgid "" -"The sponsor must to be intending to use dgit for the upload. (If the " -"sponsor does not use dgit, it is not possible to properly publish a " -"sponsee's git branch.)" +"The sponsor must be intending to use dgit for the upload. (If the sponsor " +"does not use dgit, it is not possible to properly publish a sponsee's git " +"branch.)" msgstr "" #. type: textblock diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po index 15166a7..fc13cf5 100644 --- a/po4a/dgit-user_7.nl.po +++ b/po4a/dgit-user_7.nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit-user_7\n" -"POT-Creation-Date: 2019-01-06 17:14+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: 2018-11-14 21:22+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -29,7 +29,7 @@ msgid "NAME" msgstr "NAAM" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -801,10 +801,17 @@ msgstr "" #. type: textblock #: ../dgit-user.7.pod:378 +#, fuzzy +#| msgid "" +#| "If neither of those are an option, your desperate last resort is to try " +#| "using the same version number as the official package for your own " +#| "package. (The version is controlled by C<debian/changelog> - see " +#| "above). This is not ideal because it makes it hard to tell what is " +#| "installed, and because it will mislead and confuse apt." msgid "" "If neither of those are an option, your desperate last resort is to try " "using the same version number as the official package for your own package. " -"(The version is controlled by C<debian/changelog> - see above). This is not " +"(The version is controlled by C<debian/changelog> - see above.) This is not " "ideal because it makes it hard to tell what is installed, and because it " "will mislead and confuse apt." msgstr "" diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot index 5426aef..d5a8fef 100644 --- a/po4a/dgit-user_7.pot +++ b/po4a/dgit-user_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:14+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,7 +27,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -602,7 +602,7 @@ msgstr "" msgid "" "If neither of those are an option, your desperate last resort is to try " "using the same version number as the official package for your own package. " -"(The version is controlled by C<debian/changelog> - see above). This is not " +"(The version is controlled by C<debian/changelog> - see above.) This is not " "ideal because it makes it hard to tell what is installed, and because it " "will mislead and confuse apt." msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 97cbcd7..052904f 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -738,7 +738,7 @@ msgstr "" msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " -"attribute B<dgit-defuse-attrs> and applying it to B<*>. For why, see " +"attribute, B<dgit-defuse-attrs,> and applying it to B<*>. For why, see " "B<GITATTRIBUTES> in B<dgit(7)>. Note that only attributes affecting the " "working tree are suppressed. git-archive may remain exciting." msgstr "" @@ -749,7 +749,7 @@ msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " "earlier version of dgit and git has since introduced new transforming " -"attributes, modifies the macro to disable the newer transformations." +"attributes, this modifies the macro to disable the newer transformations." msgstr "" #. type: Plain text @@ -863,7 +863,7 @@ msgid "" "prefixed with B<..> then if it already exists and dgit actually imports the " "dsc (rather than simply reading the git commit out of the Dgit field), dgit " "will make a pseudomerge so that the result is necessarily fast forward from " -"the existing branch. Otherwise, if branch already exists, dgit will stop " +"the existing branch. Otherwise, if I<branch> already exists, dgit will stop " "with an error message." msgstr "" @@ -1411,7 +1411,7 @@ msgid "" "override safety catches, including safety catches which relate to distro-" "specific policies. The use of --deliberately is declared and published in " "the signed tags generated for you by dgit, so that the archive software can " -"give effect to your intent, and for the benefit humans looking at the " +"give effect to your intent, and for the benefit of humans looking at the " "history. The meanings of I<something>s understood in the context of Debian " "are discussed below:" msgstr "" @@ -1557,9 +1557,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:858 msgid "" -"Do not check whether up source format `3.0 (quilt)' metadata needs fixing " -"up. If you use this option and the metadata did in fact need fixing up, " -"dgit push will fail." +"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " +"If you use this option and the metadata did in fact need fixing up, dgit " +"push will fail." msgstr "" #. type: TP @@ -1668,7 +1668,7 @@ msgstr "" #: ../dgit.1:938 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " -"looks for single .changes file in the parent directory whose filename " +"looks for a single .changes file in the parent directory whose filename " "suggests it is for the right package and version." msgstr "" @@ -2281,9 +2281,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:1296 msgid "" -"Like .clean-mode, but ignored if the value does not make sense to this " -"version of dgit. Setting both .clean-mode and .clean-mode-newer is useful " -"to provide a single git config compatible with different dgit versions." +"Like .clean-mode, but ignored if the value is unknown to this version of " +"dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " +"single git config compatible with different dgit versions." msgstr "" #. type: TP @@ -2390,7 +2390,7 @@ msgstr "" #: ../dgit.1:1332 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " -"Ignored for dgit setup-setup-useremail, which does it anyway." +"Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP @@ -2402,7 +2402,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:1337 msgid "" -"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" +"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " "does it anyway." msgstr "" @@ -2439,23 +2439,23 @@ msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1361 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" -"add). The options for B<dgit.default.opts->I<cmd> B<dgit-distro." -">I<distro>B</push.opts->I<cmd> and are all used, followed by options from " -"dgit's command line." +"add). The options for B<dgit.default.opts->I<cmd> and B<dgit-distro." +">I<distro>B</push.opts->I<cmd> are all used, followed by options from dgit's " +"command line." msgstr "" #. type: SH -#: ../dgit.1:1360 +#: ../dgit.1:1361 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1365 +#: ../dgit.1:1366 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2464,204 +2464,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1365 +#: ../dgit.1:1366 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1368 +#: ../dgit.1:1369 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1368 +#: ../dgit.1:1369 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1372 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1371 +#: ../dgit.1:1372 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1378 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1378 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1380 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1382 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1384 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1385 +#: ../dgit.1:1386 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1387 +#: ../dgit.1:1388 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1390 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1391 +#: ../dgit.1:1392 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1394 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>" msgstr "" #. type: TP -#: ../dgit.1:1395 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1397 +#: ../dgit.1:1398 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1400 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1401 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1404 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1406 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1408 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1410 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1411 +#: ../dgit.1:1412 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1414 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1415 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1417 +#: ../dgit.1:1418 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1419 +#: ../dgit.1:1420 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1421 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1423 +#: ../dgit.1:1424 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1425 +#: ../dgit.1:1426 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1427 +#: ../dgit.1:1428 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1429 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1438 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2671,26 +2671,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1438 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1442 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1442 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1446 +#: ../dgit.1:1447 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2698,13 +2698,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1446 +#: ../dgit.1:1447 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1453 +#: ../dgit.1:1454 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2712,7 +2712,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1459 +#: ../dgit.1:1460 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2720,7 +2720,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1464 +#: ../dgit.1:1465 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2729,7 +2729,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1469 +#: ../dgit.1:1470 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2737,7 +2737,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -2748,13 +2748,13 @@ msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1478 +#: ../dgit.1:1479 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1479 +#: ../dgit.1:1480 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index 78ed743..1329e77 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -39,11 +39,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -292,7 +292,7 @@ msgstr "" #: ../dgit.7:166 msgid "" "When using this facility, it is important to always specify the same suites " -"in the same order: dgit will not be make a coherent fast-forwarding history " +"in the same order: dgit will not make a coherent fast-forwarding history " "view otherwise." msgstr "" @@ -611,7 +611,7 @@ msgstr "" #: ../dgit.7:371 msgid "" "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " -"edge which cannot be sensibly be either ignored, or turned into a patch in " +"edge which cannot sensibly be either ignored, or turned into a patch in " "debian/patches. In this example, this is because it itself changes files in " "debian/patches, indicating that something unusual is going on and that " "continuing is not safe. But you might also see other kinds of troublesome " diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 630039b..0697082 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -33,7 +33,7 @@ msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -88,7 +88,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:22 msgid "" -"You should read this manpage in cojnunction with L<git-debrebase(5)/" +"You should read this manpage in conjunction with L<git-debrebase(5)/" "TERMINOLOGY>, which defines many important terms used here." msgstr "" @@ -157,7 +157,7 @@ msgstr "" msgid "" "It is hazardous to use plain git-rebase on a git-debrebase branch, because " "git-rebase has a tendency to start the rebase too far back in history, and " -"then drop important commits. Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>" +"then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>" msgstr "" #. type: =item @@ -325,7 +325,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:157 msgid "" -"<new-version> may be whole new Debian version, including revision, or just " +"<new-version> may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " "version." msgstr "" @@ -461,7 +461,7 @@ msgstr "" msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " -"and an error message. (The message can be suppress with --quiet-would-" +"and an error message. (The message can be suppressed with --quiet-would-" "amend.) If the problem is simply that the existing patches were not made by " "git-debrebase, using dgit quilt-fixup instead should succeed." msgstr "" @@ -478,7 +478,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:261 -msgid "Cnnverts any of the following into a git-debrebase interchange branch:" +msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock @@ -651,7 +651,7 @@ msgstr "" #: ../git-debrebase.1.pod:371 msgid "" "This is provided mostly for the test suite and for unusual situations. It " -"should only be used with a care and with a proper understanding of the " +"should only be used with care and with a proper understanding of the " "underlying theory." msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index f5c7df7..71601b1 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -312,7 +312,7 @@ msgstr "" #: ../git-debrebase.5.pod:147 msgid "" "git-debrebase has one primary branch, the B<interchange branch>. This " -"branch is found on Debian contributor's workstations (typically, a " +"branch is found on Debian contributors' workstations (typically, a " "maintainer would call it B<master>), in the Debian dgit git server as the " "suite branch (B<dgit/dgit/sid>) and on other git servers which support " "Debian work (eg B<master> on salsa)." @@ -349,7 +349,7 @@ msgid "" "C<debian/> directory that may be in the upstream commits). The breakwater " "does not contain any representation of the delta queue (not even debian/" "patches). The part of the breakwater processed by git-debrebase is the part " -"since the most reecent B<anchor>, which is usually a special merge generated " +"since the most recent B<anchor>, which is usually a special merge generated " "by git-debrebase." msgstr "" @@ -446,8 +446,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:257 msgid "" -"Zero or more single-parent commits contaioning only changes to upstream " -"files." +"Zero or more single-parent commits containing only changes to upstream files." msgstr "" #. type: textblock @@ -455,8 +454,7 @@ msgstr "" msgid "" "The merely B<unstitched> (ie, unstitched but unlaundered) branch state is " "also B<rebasing>. It has the same contents as the laundered state, except " -"that it may contain, additionally, in B<in any order but after the " -"breakwater>:" +"that it may contain, additionally, B<in any order but after the breakwater>:" msgstr "" #. type: =item @@ -601,8 +599,8 @@ msgstr "" msgid "" "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor " "of refs/B, (usually, the result of last stitch). This is used for status " -"printing and some error error checks - especially for printing guesses what " -"a problem is. To determine whether a branch is is being maintained in git-" +"printing and some error error checks - especially for printing guesses about " +"what a problem is. To determine whether a branch is being maintained in git-" "debrebase form it is necessary to walk its history." msgstr "" @@ -666,7 +664,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:422 msgid "" -"The following basic operations follows from this model (refer to the diagram " +"The following basic operations follow from this model (refer to the diagram " "above):" msgstr "" @@ -762,11 +760,11 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:474 msgid "" -"Make a pseudomerge, whose contributing parent to is the unstitched branch " -"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process " -"(and writing debrebase-last instead). Ideally the contributing parent would " -"be a laundered branch, or perhaps a laundered branch with a quilt patch " -"addition commit." +"Make a pseudomerge, whose contributing parent is the unstitched branch and " +"whose overwritten parent is ffq-prev, consuming ffq-prev in the process (and " +"writing debrebase-last instead). Ideally the contributing parent would be a " +"laundered branch, or perhaps a laundered branch with a quilt patch addition " +"commit." msgstr "" #. type: =item @@ -778,7 +776,7 @@ msgstr "" #: ../git-debrebase.5.pod:485 msgid "" "To generate a tree which can be represented as a 3.0 (quilt) .dsc source " -"packages, the delta queue must be reified inside the git tree in B<debian/" +"package, the delta queue must be reified inside the git tree in B<debian/" "patches/>. These patch files can be stripped out and/or regenerated as " "needed." msgstr "" @@ -827,7 +825,7 @@ msgstr "" #: ../git-debrebase.5.pod:514 msgid "" "For these reasons, it is better to use git-debrebase and let it choose the " -"base for your rebase. If you do realise you have make this mistake, it is " +"base for your rebase. If you do realise you have made this mistake, it is " "best to use the reflog to recover to a suitable good previous state." msgstr "" |