From f725417edb60bcda26f3055d6c52560130ef0b29 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 8 Nov 2018 02:11:50 +0000 Subject: changelog: start 8.2~ Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 838025b..66f66d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (8.2~) unstable; urgency=medium + + * + + -- + dgit (8.1) unstable; urgency=medium git-debrebase; -- cgit v1.2.3 From ab7495e238581ab2d3486d6a11f3e18ac467caee Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 12 Nov 2018 18:13:00 +0000 Subject: po/README: Fix reference to dgit-user_7.pot Signed-off-by: Ian Jackson --- po/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/README b/po/README index dcf0e86..3eb1b04 100644 --- a/po/README +++ b/po/README @@ -32,7 +32,7 @@ Translatation priorities HIGH - po4a/dgit-user_1.pot How to use dgit to as a downstream or user + po4a/dgit-user_7.pot How to use dgit to as a downstream or user MEDIUM -- cgit v1.2.3 From 5037e698814b11ea2cf7d7c74f4f41673efcf7ce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 20 Nov 2018 22:03:48 +0000 Subject: dgit(1): Fix documentation of .quilt-mode config In 0457c2d771ef6fe6c0883344add9dd4da0c60917 dgit: Honour new .clean-mode-newer access config option this was accidentally deleted. Signed-off-by: Ian Jackson --- dgit.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit.1 b/dgit.1 index c3dd420..422a363 100644 --- a/dgit.1 +++ b/dgit.1 @@ -1270,7 +1270,7 @@ 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. .TP -.BR dgit-distro. \fIdistro\fR .quilt- +.BR dgit-distro. \fIdistro\fR .quilt-mode One of the values for the command line --quilt= option; used if --quilt is not specified. .TP -- cgit v1.2.3 From c5fa292f1f6b9517116c80d9bae313b7db4cedac Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 28 Nov 2018 18:16:47 +0000 Subject: dgit(1): Fix reference to -wdn/-wddn in a message. It's not -wdu/-wddu. Signed-off-by: Ian Jackson --- dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit b/dgit index e104838..c62d1cc 100755 --- a/dgit +++ b/dgit @@ -6222,7 +6222,7 @@ sub clean_tree_check_git_wd ($) { (f_ < Date: Sat, 5 Jan 2019 20:03:08 +0000 Subject: test suite: pretend-pbuilder: Reject unknown options The failure to do this was simply a bug. Signed-off-by: Ian Jackson --- tests/pretend-pbuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/pretend-pbuilder b/tests/pretend-pbuilder index 8495a2f..1d39eb3 100755 --- a/tests/pretend-pbuilder +++ b/tests/pretend-pbuilder @@ -12,7 +12,8 @@ die "pbuilder: you should use me only to build, dgit" my $debbuildopts = undef; my $distribution = undef; GetOptions('debbuildopts=s' => \$debbuildopts, - 'distribution=s' => \$distribution); + 'distribution=s' => \$distribution) + or die; # ignore user args; last argument has to be the .dsc filename my $dsc = $ARGV[-1]; -- cgit v1.2.3 From 6c32ca2f056fc65bfc1aedbac6cdccdec0df0e01 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Jan 2019 20:27:06 +0000 Subject: dgit: Provide --program!:option Apropos of #904862. Signed-off-by: Ian Jackson --- dgit | 6 ++++++ dgit.1 | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dgit b/dgit index c62d1cc..a5f9314 100755 --- a/dgit +++ b/dgit @@ -7192,6 +7192,12 @@ sub parseopts () { ($om = $opts_opt_map{$1})) { push @ropts, $_; push @$om, $2; + } elsif (m/^--([-0-9a-z]+)\!:(.*)/s && + !$opts_opt_cmdonly{$1} && + ($om = $opts_opt_map{$1})) { + push @ropts, $_; + my $cmd = shift @$om; + @$om = ($cmd, grep { $_ ne $2 } @$om); } elsif (m/^--(gbp|dpm)$/s) { push @ropts, "--quilt=$1"; $quilt_mode = $1; diff --git a/dgit.1 b/dgit.1 index 422a363..993d50b 100644 --- a/dgit.1 +++ b/dgit.1 @@ -1079,6 +1079,24 @@ and the .B keyid distro config setting. .TP +.RI \fB--curl!:\fR option " | \fB--dput!:\fR" option " |..." +Specifies an option to remove from the command line for +a program called by dgit, as for +\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR +(and the same caveats apply). + +Any options or arguments exactly identical to +.I option +are removed. +(It is not an error if there were none.) + +This can only be used to delete options +which are always passed by default by dgit, +or to undo a previous +\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR. +It cannot be used to override option(s) dynamically +decided on by dgit. +.TP .RI \fB--curl=\fR program " | \fB--dput=\fR" program " |..." Specifies alternative programs to use instead of .BR curl , -- cgit v1.2.3 From ad6d3f80a0a0f2b0aace7dcf8a3bf48ed16f655f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Jan 2019 20:28:27 +0000 Subject: dgit: Pass --no-source-only-changes to pbuilder and cowbuilder This will break with older versions of pbuilder and cowbuilder, unfortunately. That breakage can be worked around by passing dgit one or both of the new options: --pbuilder!:--no-source-only-changes --cowbuilder!:--no-source-only-changes Closes: #904862. Signed-off-by: Ian Jackson --- dgit | 4 ++-- tests/tests/pbuilder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index a5f9314..922d719 100755 --- a/dgit +++ b/dgit @@ -132,8 +132,8 @@ our (@mergechanges) = qw(mergechanges -f); our (@gbp_build) = (''); our (@gbp_pq) = ('gbp pq'); our (@changesopts) = (''); -our (@pbuilder) = ("sudo -E pbuilder"); -our (@cowbuilder) = ("sudo -E cowbuilder"); +our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes"); +our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes"); our %opts_opt_map = ('dget' => \@dget, # accept for compatibility 'curl' => \@curl, diff --git a/tests/tests/pbuilder b/tests/tests/pbuilder index 2c9dbae..56eed0b 100755 --- a/tests/tests/pbuilder +++ b/tests/tests/pbuilder @@ -23,7 +23,7 @@ t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" pbuilder -b # it would be nice to try passing -g on the end of the following line # to confirm it gets massaged into -A, but the example package is # RC-buggy in that it doesn't build with -A .. -t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" pbuilder +t-dgit -v0 --pbuilder="$troot/pretend-pbuilder" --pbuilder!:--no-source-only-changes pbuilder t-dgit -wgf push --new -- cgit v1.2.3 From b2cc53039123fae1e871b9727730f418d8065905 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 1 Jan 2019 18:51:51 +0000 Subject: dgit-maint-debrebase(7): handle DFSG-filtering for a new package Closes: #915973 Signed-off-by: Sean Whitton --- dgit-maint-debrebase.7.pod | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index f167928..4996e6a 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -487,7 +487,9 @@ email your archive administrators. For Debian that is Our approach is to maintain a DFSG-clean upstream branch, and create tags on this branch for each release that we want to import. We then -import those tags per "Importing the release", above. +import those tags per "Importing the release", above. In the case of +a new package, we base our initial Debianisation on our first +DFSG-clean tag. For the first upstream release that requires DFSG filtering: @@ -498,11 +500,23 @@ For the first upstream release that requires DFSG filtering: % git commit -m "upstream version 1.2.3 DFSG-cleaned" % git tag -s 1.2.3+dfsg % git checkout master - % # proceed with "Importing the release" on 1.2.3+dfsg tag =back -And for subsequent releases (whether or not they require filtering): +Now either proceed with "Importing the release" on the 1.2.3+dfsg tag, +or in the case of a new package, + +=over 4 + + % git branch --unset-upstream + % git reset --hard 1.2.3+dfsg + +=back + +and proceed with "INITIAL DEBIANISATION". + +For subsequent releases (whether or not they require additional +filtering): =over 4 -- cgit v1.2.3 From 07a861b637e45f33cfbb9031e6fe4061f31e929c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Jan 2019 21:15:49 +0000 Subject: dgit: clone: Create destination directory before using network We are going to want to check the bpd (apropos of #913648), which might be a relative path. We should fail quickly in this case. No significant functional change. Signed-off-by: Ian Jackson --- dgit | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 922d719..b25d344 100755 --- a/dgit +++ b/dgit @@ -3758,10 +3758,12 @@ sub clone ($) { } printdebug "clone main body\n"; - canonicalise_suite(); - my $hasgit = check_for_git(); mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!; changedir $dstdir; + + canonicalise_suite(); + my $hasgit = check_for_git(); + runcmd @git, qw(init -q); record_maindir(); setup_new_tree(); -- cgit v1.2.3 From 2a4a723706efc5c7f520b01acc7ce211338d6bee Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Jan 2019 21:17:30 +0000 Subject: dgit: Check that the build-products-dir is accessible In fetch/clone, and build. Others are less likely to be an irritating problem. Closes: #913648. Signed-off-by: Ian Jackson --- dgit | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dgit b/dgit index b25d344..1090984 100755 --- a/dgit +++ b/dgit @@ -2197,6 +2197,12 @@ sub check_for_vendor_patches () { __ "(nominal) distro being accessed"); } +sub check_bpd_exists () { + stat $buildproductsdir + or fail f_ "build-products-dir %s is not accessible: %s\n", + $buildproductsdir, $!; +} + sub generate_commits_from_dsc () { # See big comment in fetch_from_archive, below. # See also README.dsc-import. @@ -3062,6 +3068,7 @@ END } sub fetch_from_archive () { + check_bpd_exists(); ensure_setup_existing_tree(); # Ensures that lrref() is what is actually in the archive, one way @@ -3760,6 +3767,7 @@ sub clone ($) { mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!; changedir $dstdir; + check_bpd_exists(); canonicalise_suite(); my $hasgit = check_for_git(); @@ -6305,6 +6313,7 @@ sub build_prep_early () { sub build_prep ($) { my ($wantsrc) = @_; build_prep_early(); + check_bpd_exists(); if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) { # Clean the tree because we're going to use the contents of # $maindir. (We trying to include dirty changes in the source -- cgit v1.2.3 From 37b5c1d305b5b7362e83ea4cbfdab4b9544031d3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Jan 2019 23:27:01 +0000 Subject: dgit-repos-policy-debian: Remove duplicated text from force message $ovwhy is from SELECT deliberately ... WHERE ... OR deliberately = ? where ? is a key in %deliberately which came from the command line where it already contains --deliberately=. Closes: #913676 Signed-off-by: Ian Jackson --- infra/dgit-repos-policy-debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index e85e92c..f7e5e53 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -461,7 +461,7 @@ END $mustreject = 1; } else { $stderr .= <prepare(< Date: Sun, 6 Jan 2019 00:39:29 +0000 Subject: Dgit.pm: Allow uppercase (ascii) letters in multi-orig components We didn't recognise files like firefox-esr_60.4.0esr.orig-l10n-sv-SE.tar.bz2 as orig files. As a result, dgit would see all the things in the corresponding subdirectory as having been added in Debian changes, leading it making inaccurate complaints and bombing out. See also #918438 against policy, where I (effectively) argue that this is a design error in the `3.0 (quilt)' format. Closes: #916926 Signed-off-by: Ian Jackson --- Debian/Dgit.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 458017d..2ef32f3 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -98,7 +98,7 @@ our $distro_re = $component_re; our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+}; our $branchprefix = 'dgit'; our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s; -our $extra_orig_namepart_re = qr{[-0-9a-z]+}; +our $extra_orig_namepart_re = qr{[-0-9a-zA-Z]+}; our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?}; our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)'; our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?"; -- cgit v1.2.3 From e0c2627975ac581b23826ec9a3e766df5dfea46c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 01:44:43 +0000 Subject: dgit(1): Fix a formatting typo Signed-off-by: Ian Jackson --- dgit.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit.1 b/dgit.1 index 993d50b..60bf0d3 100644 --- a/dgit.1 +++ b/dgit.1 @@ -543,7 +543,7 @@ dgit will only actually clean the tree if it needs to (because it needs to build the source package or binaries from your working tree). Otherwise any untracked files will be simply ignored. -p.TP +.TP .BR --clean=git-ff " | " -wgf Use .BR "git clean -xdff" -- cgit v1.2.3 From 70b522e712e52444e8c7b924502380d6413040fa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 11:15:13 +0000 Subject: dgit: clean: Change matcbing of git to regexps We are going to have some ,... suffixes on this, so we need more general matching. No functional change with the current set of clean modes. Signed-off-by: Ian Jackson --- dgit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 1090984..37d3861 100755 --- a/dgit +++ b/dgit @@ -6269,9 +6269,9 @@ sub clean_tree () { runcmd_ordryrun_local @cmd; clean_tree_check_git_wd __ "tree contains uncommitted files (after running rules clean)"; - } elsif ($cleanmode eq 'git') { + } elsif ($cleanmode =~ m{^git(?!-)}) { runcmd_ordryrun_local @git, qw(clean -xdf); - } elsif ($cleanmode eq 'git-ff') { + } elsif ($cleanmode =~ m{^git-ff}) { runcmd_ordryrun_local @git, qw(clean -xdff); } elsif ($cleanmode =~ m{^check}) { clean_tree_check(); -- cgit v1.2.3 From 2a9e81a612e9ef5221c9a4c1554a06f20ea00e8c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 11:58:10 +0000 Subject: dgit: clean: Prepare cleanmode_re for suffixes on git and git-ff No functional change. Signed-off-by: Ian Jackson --- dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit b/dgit index 37d3861..9b107c2 100755 --- a/dgit +++ b/dgit @@ -102,7 +102,7 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); our $suite_re = '[-+.0-9a-z]+'; our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )? - | git | git-ff + | (?: git | git-ff ) | check (?: ,ignores )? | none )}x; -- cgit v1.2.3 From d22395d9e46d321b69086def1088fa10516039de Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 12:00:08 +0000 Subject: dgit: clean mode: Refactor -wg parsing to prep for suffixes This will make it convenient to add new suffix letter(s) to -wg. No functional change. Signed-off-by: Ian Jackson --- dgit | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dgit b/dgit index 9b107c2..55c8070 100755 --- a/dgit +++ b/dgit @@ -7298,12 +7298,10 @@ sub parseopts () { } elsif (s/^-wn$//s) { push @ropts, $&; $cleanmode = 'none'; - } elsif (s/^-wg$//s) { + } elsif (s/^-wg(f?)$//s) { push @ropts, $&; $cleanmode = 'git'; - } elsif (s/^-wgf$//s) { - push @ropts, $&; - $cleanmode = 'git-ff'; + $cleanmode .= '-ff' if $1; } elsif (s/^-wd(d?)([na]?)$//s) { push @ropts, $&; $cleanmode = 'dpkg-source'; -- cgit v1.2.3 From dc9df4ad8714bab9656d932854ef5631b46c124e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 13:26:10 +0000 Subject: test suite: exmaplegit: Do not leave the tree dirty This test setup facility passed a dirty working tree to all of its consumers. That was not really intended or useful, and is about to start causing trouble. Signed-off-by: Ian Jackson --- tests/setup/examplegit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/setup/examplegit b/tests/setup/examplegit index 48864d4..88f6178 100755 --- a/tests/setup/examplegit +++ b/tests/setup/examplegit @@ -48,4 +48,6 @@ git add which t-commit Sid push-to master sid +git clean -xdff + t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p" -- cgit v1.2.3 From 9453958d76cb530bbc0af1802cfeaadd26e19c6c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 02:15:31 +0000 Subject: dgit: clean: Do check the tree even when building in playtree If we might be doing quilt fixup, then the quilt fixup's attempt to merge back into master might fail if there are uncommitted debian/patches. So it is sometimes wrong to just not clean at all. We don't want the behaviour to depend on the source package format, and ideally not on the clean mode. Also, the user may have forgotten to `git add', in which case they will thank us for spotting their mistake. In the original design table in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910705#56 says this for this case /: disregarded would be fine to delete but ** better to trip ? ** ** want opt to disregard ** but this was not implemented at the time. So implement that now. I think I have concluded that with -wg and -wgf the right way to turn these new failures into successes is to have a way to have the clean actually done. If that is not wanted, one can say -wn instead. This is particularly true given that ignoring the problem can produce confusing failure, as seen in #914317. So there will be a new --clean=git[-ff],always shortly. Closes: #914317 Signed-off-by: Ian Jackson --- dgit | 6 ++---- tests/lib-build-modes | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dgit b/dgit index 55c8070..22441d7 100755 --- a/dgit +++ b/dgit @@ -6238,7 +6238,6 @@ END } sub clean_tree_check () { - # Not yet fully implemented. # This function needs to not care about modified but tracked files. # That was done by check_not_dirty, and by now we may have run # the rules clean target which might modify tracked files (!) @@ -6249,9 +6248,8 @@ sub clean_tree_check () { clean_tree_check_git_wd __ "tree contains uncommitted files (NB dgit didn't run rules clean)"; } elsif ($cleanmode =~ m{^git}) { - # If we were actually cleaning these files would be summarily - # deleted. Since we're not, and not using the working tree - # anyway, we can just ignore them - nothing will use them. + clean_tree_check_git_wd __ + "tree contains uncommitted files"; } elsif ($cleanmode eq 'none') { } else { confess "$cleanmode ?"; diff --git a/tests/lib-build-modes b/tests/lib-build-modes index bc8b2aa..8c05af6 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -160,7 +160,7 @@ bm-compute-expected () { ;; none|Cnone) ;; Cdpkg-source*) ;; # handled below - Cgit|Cgit-ff) ;; + Cgit|Cgit-ff) echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;; *) fail "t-compute-expected-run $cleanmode ??" ;; esac -- cgit v1.2.3 From a73c60edeaaf776cee0b9065b25ce312baccc49b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 11:36:52 +0000 Subject: dgit: cleaning: Improve handling of note about ignores * Provide a new $ignmessage parameter to clean_tree_check_git and use that. This makes it a bit easier to: * Only print the additional message if the clean mode actually honoured ignores. If it didn't then the problem is not `due to missing .gitignore entries' because they would not have helped. * Change all callers other than clean_tree_check_git_wd to pass the empty string, so no other overall functional change. Signed-off-by: Ian Jackson --- dgit | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dgit b/dgit index 22441d7..988eb94 100755 --- a/dgit +++ b/dgit @@ -6213,13 +6213,14 @@ sub maybe_unapply_patches_again () { #----- other building ----- -sub clean_tree_check_git ($$) { - my ($honour_ignores, $message) = @_; +sub clean_tree_check_git ($$$) { + my ($honour_ignores, $message, $ignmessage) = @_; my @cmd = (@git, qw(clean -dn)); push @cmd, qw(-x) unless $honour_ignores; my $leftovers = cmdoutput @cmd; if (length $leftovers) { print STDERR $leftovers, "\n" or confess $!; + $message .= $ignmessage if $honour_ignores; fail $message; } } @@ -6229,8 +6230,7 @@ sub clean_tree_check_git_wd ($) { return if $cleanmode =~ m{no-check}; return if $patches_applied_dirtily; # yuk clean_tree_check_git +($cleanmode !~ m{all-check}), - (f_ < Date: Sun, 6 Jan 2019 12:54:16 +0000 Subject: dgit: clean: Provide new --git[-ff],always clean mode Signed-off-by: Ian Jackson --- dgit | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index 988eb94..87ab862 100755 --- a/dgit +++ b/dgit @@ -102,7 +102,7 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); our $suite_re = '[-+.0-9a-z]+'; our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )? - | (?: git | git-ff ) + | (?: git | git-ff ) (?: ,always )? | check (?: ,ignores )? | none )}x; @@ -6249,7 +6249,8 @@ sub clean_tree_check () { "tree contains uncommitted files (NB dgit didn't run rules clean)"; } elsif ($cleanmode =~ m{^git}) { clean_tree_check_git 1, __ - "tree contains uncommited, untracked, unignored files", ''; + "tree contains uncommited, untracked, unignored files\n". + "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", ''; } elsif ($cleanmode eq 'none') { } else { confess "$cleanmode ?"; @@ -6312,10 +6313,12 @@ sub build_prep ($) { my ($wantsrc) = @_; build_prep_early(); check_bpd_exists(); - if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) { + if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER) # Clean the tree because we're going to use the contents of # $maindir. (We trying to include dirty changes in the source # package, or we are running the builder in $maindir.) + || $cleanmode =~ m{always}) { + # Or because the user asked us to. clean_tree(); } else { # We don't actually need to do anything in $maindir, but we -- cgit v1.2.3 From 78284e5d62da0a01dd9fc0f4c28630015b11f2a2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 12:01:18 +0000 Subject: dgit: clean: Provide -wg[f]a short aliases Signed-off-by: Ian Jackson --- dgit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dgit b/dgit index 87ab862..d16e5b7 100755 --- a/dgit +++ b/dgit @@ -7299,10 +7299,11 @@ sub parseopts () { } elsif (s/^-wn$//s) { push @ropts, $&; $cleanmode = 'none'; - } elsif (s/^-wg(f?)$//s) { + } elsif (s/^-wg(f?)(a?)$//s) { push @ropts, $&; $cleanmode = 'git'; $cleanmode .= '-ff' if $1; + $cleanmode .= ',always' if $2; } elsif (s/^-wd(d?)([na]?)$//s) { push @ropts, $&; $cleanmode = 'dpkg-source'; -- cgit v1.2.3 From 02034520dc1174e9c841f0a37e9590ce421af06f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 12:15:53 +0000 Subject: dgit: Document new --clean=git behaviours Signed-off-by: Ian Jackson --- dgit.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dgit.1 b/dgit.1 index 60bf0d3..6f89574 100644 --- a/dgit.1 +++ b/dgit.1 @@ -542,7 +542,9 @@ to avoid needing the build-dependencies. dgit will only actually clean the tree if it needs to (because it needs to build the source package or binaries from your working tree). -Otherwise any untracked files will be simply ignored. +Otherwise +it will just check that there are no untracked unignored files. +See --clean=git[-ff],always, below. .TP .BR --clean=git-ff " | " -wgf Use @@ -553,6 +555,10 @@ git clean -xdf but it also removes any subdirectories containing different git trees (which only unusual packages are likely to create). .TP +.BR --clean=git "[" -ff "]" ,always " | " -wga " | " -wgfa +Like --clean=git, but always does the clean and not just a check, +deleting any untracked un-ignored files. +.TP .BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci Merely check that the tree is clean (does not contain uncommitted files). -- cgit v1.2.3 From 3138c37d23daef09e7bcd4627f4fca5ea77ccf3b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 13:35:56 +0000 Subject: test suite: Test --clean-git[-ff],always Signed-off-by: Ian Jackson --- tests/lib-build-modes | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 8c05af6..27c5b06 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -38,6 +38,7 @@ bm-prep () { cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra" cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra" cleanmodes_all="$cleanmodes_default git-ff check" + cleanmodes_all+=" git,always git,always" cleanmodes="$cleanmodes_default" } @@ -148,8 +149,10 @@ bm-compute-expected () { # that too and reset eff_cleanmode to $cleanmode case $eff_cleanmode in - git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; - git-ff) echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;; + git|Cgit,always) + echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; + git-ff|Cgit-ff,always) + echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;; check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;; dpkg-source-d|dpkg-source-d,no-check) echo >&4 "EXAMPLE RULES TARGET clean" -- cgit v1.2.3 From 61c3f782ef35c8a476a16786050905a7c70a7162 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:04:42 +0000 Subject: dgit: generate_commits_from_dsc: Factor out $bpd_abs And add a newline. We will want this in a moment. No functional change. Signed-off-by: Ian Jackson --- dgit | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dgit b/dgit index d16e5b7..e9f7391 100755 --- a/dgit +++ b/dgit @@ -2209,11 +2209,13 @@ sub generate_commits_from_dsc () { prep_ud(); changedir $playground; + my $bpd_abs = bpd_abs(); my @dfi = dsc_files_info(); + foreach my $fi (@dfi) { my $f = $fi->{Filename}; die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#; - my $upper_f = (bpd_abs()."/$f"); + my $upper_f = "$bpd_abs/$f"; printdebug "considering reusing $f: "; -- cgit v1.2.3 From 35c93d228a9287b0c66fdfeba971c7a404566f17 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:13:42 +0000 Subject: dgit: generate_commits_from_dsc: Move up $upstreamv We will want this in a moment. No functional change. Signed-off-by: Ian Jackson --- dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit b/dgit index e9f7391..5684ba9 100755 --- a/dgit +++ b/dgit @@ -2210,6 +2210,7 @@ sub generate_commits_from_dsc () { changedir $playground; my $bpd_abs = bpd_abs(); + my $upstreamv = upstreamversion $dsc->{version}; my @dfi = dsc_files_info(); foreach my $fi (@dfi) { @@ -2262,7 +2263,6 @@ sub generate_commits_from_dsc () { # from the debian/changelog, so we record the tree objects now and # make them into commits later. my @tartrees; - my $upstreamv = upstreamversion $dsc->{version}; my $orig_f_base = srcfn $upstreamv, ''; foreach my $fi (@dfi) { -- cgit v1.2.3 From d20678a503170c1c4d8cbb7db39859263ff9ded9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:24:09 +0000 Subject: dgit: Remove foolish uses of $b in unpack_playtree_linkorigs etc. Evidently I had forgotten that $b is weird in Perl and should not by used for things other than sorting. Signed-off-by: Ian Jackson --- dgit | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dgit b/dgit index 5684ba9..f769eb9 100755 --- a/dgit +++ b/dgit @@ -5793,16 +5793,16 @@ sub unpack_playtree_linkorigs ($$) { my $bpd_abs = bpd_abs(); opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!"; - while ($!=0, defined(my $b = readdir QFD)) { - my $f = bpd_abs()."/".$b; + while ($!=0, defined(my $leaf = readdir QFD)) { + my $f = bpd_abs()."/".$leaf; { local ($debuglevel) = $debuglevel-1; - printdebug "QF linkorigs $b, $f ?\n"; + printdebug "QF linkorigs bpd $leaf, $f ?\n"; } - next unless is_orig_file_of_vsn $b, $upstreamversion; - printdebug "QF linkorigs $b, $f Y\n"; - link_ltarget $f, $b or die "$b $!"; - $fn->($b); + next unless is_orig_file_of_vsn $leaf, $upstreamversion; + printdebug "QF linkorigs $leaf, $f Y\n"; + link_ltarget $f, $leaf or die "$leaf $!"; + $fn->($leaf); } die "$buildproductsdir: $!" if $!; closedir QFD; @@ -5859,16 +5859,16 @@ Files: END my $dscaddfile=sub { - my ($b) = @_; + my ($leaf) = @_; my $md = new Digest::MD5; - my $fh = new IO::File $b, '<' or die "$b $!"; + my $fh = new IO::File $leaf, '<' or die "$leaf $!"; stat $fh or confess $!; my $size = -s _; $md->addfile($fh); - print $fakedsc " ".$md->hexdigest." $size $b\n" or confess $!; + print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess $!; }; unpack_playtree_linkorigs($upstreamversion, $dscaddfile); -- cgit v1.2.3 From 1cddc7a46108876e5f65756bc0fe24460eaf34fa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:25:06 +0000 Subject: dgit: Remove foolish use of $b in quilt_fixup_multipatch Signed-off-by: Ian Jackson --- dgit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index f769eb9..4b147b2 100755 --- a/dgit +++ b/dgit @@ -6104,9 +6104,9 @@ END }; my @dl; - foreach my $b (qw(01 02)) { + foreach my $bits (qw(01 02)) { foreach my $v (qw(O2H O2A H2A)) { - push @dl, ($diffbits->{$v} & $b) ? '##' : '=='; + push @dl, ($diffbits->{$v} & $bits) ? '##' : '=='; } } printdebug "differences \@dl @dl.\n"; -- cgit v1.2.3 From 9c71794454566244b7eaa528ead35b76cca40fc5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:27:35 +0000 Subject: dgit: Provide dotdot_bpd_transfer_origs for using origs from .. No callers yet so no functional change. Signed-off-by: Ian Jackson --- dgit | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dgit b/dgit index 4b147b2..21a3f28 100755 --- a/dgit +++ b/dgit @@ -2203,6 +2203,66 @@ sub check_bpd_exists () { $buildproductsdir, $!; } +sub dotdot_bpd_transfer_origs ($$$) { + my ($bpd_abs, $upstreamversion, $wanted) = @_; + # checks is_orig_file_of_vsn and if + # calls $wanted->{$leaf} and expects boolish + my $warned; + + if ($buildproductsdir ne '..') { + my $dotdot = $maindir; + $dotdot =~ s{/[^/]+$}{}; + opendir DD, $dotdot or fail "opendir .. ($dotdot): $!"; + while ($!=0, defined(my $leaf = readdir DD)) { + { + local ($debuglevel) = $debuglevel-1; + printdebug "DD_BPD $leaf ?\n"; + } + next unless is_orig_file_of_vsn $leaf, $upstreamversion; + next unless $wanted->($leaf); + next if lstat "$bpd_abs/$leaf"; + + print STDERR f_ +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n", + $us + unless $warned++; + $! == &ENOENT or fail f_ + "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!; + lstat "$dotdot/$leaf" or fail f_ + "check orig file %s in ..: %s", $leaf, $!; + if (-l _) { + stat "$dotdot/$leaf" or fail f_ + "check targe of orig symlink %s in ..: %s", $leaf, $!; + my $ltarget = readlink "$dotdot/$leaf" or + die "readlink $dotdot/$leaf: $!"; + if ($ltarget !~ m{^/}) { + $ltarget = "$dotdot/$ltarget"; + } + symlink $ltarget, "$bpd_abs/$leaf" + or die "$ltarget $bpd_abs $leaf: $!"; + print STDERR f_ + "%s: cloned orig symlink from ..: %s\n", + $us, $leaf; + } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") { + print STDERR f_ + "%s: hardlinked orig from ..: %s\n", + $us, $leaf; + } elsif ($! != EXDEV) { + fail f_ "failed to make %s a hardlink to %s: %s", + "$bpd_abs/$leaf", "$dotdot/$leaf", $!; + } else { + symlink "$bpd_abs/$leaf", "$dotdot/$leaf" + or die "$bpd_abs $dotdot $leaf $!"; + print STDERR f_ + "%s: symmlinked orig from .. on other filesystem: %s\n", + $us, $leaf; + } + } + die "$dotdot; $!" if $!; + closedir DD; + } +} + sub generate_commits_from_dsc () { # See big comment in fetch_from_archive, below. # See also README.dsc-import. -- cgit v1.2.3 From 6a15486772ae1aca46f196e6d2b46b30d82e4994 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:30:13 +0000 Subject: dgit: Transfer origs from .. to bpd when building This is apropos of #904878. When building we need to consider anything in .. that would be (accordingg to its filename) a possible orig for the package we are building, since we do not know what origs there are supposed to be, and missing ones generate unhelpful error messages. We `copy' things from .. to bpd, rather than just trying to use them directly from .., because otherwise lots of other things won't work right. For example, we might generate .dsc's in the bpd which expect the files alongside, but without the files. But we don't actually copy any files. We prefer to: * If the thing in .. is a symlink, copy the link text, adjusting it into an absolute link. * If the thing in .. is a file, try to hardlink it, or failing that make a symlink to it. The result is that we never duplicate the file contents, but still, where possible, we prefer to make the thing in bpd stand alone so that if the `copy' in .. is deleted everything is still fine. Signed-off-by: Ian Jackson --- dgit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dgit b/dgit index 21a3f28..e57f3ea 100755 --- a/dgit +++ b/dgit @@ -5852,6 +5852,9 @@ sub unpack_playtree_linkorigs ($$) { # calls $fn->($leafname); my $bpd_abs = bpd_abs(); + + dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 }; + opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!"; while ($!=0, defined(my $leaf = readdir QFD)) { my $f = bpd_abs()."/".$leaf; -- cgit v1.2.3 From a44387b654d8d6a079efc16e76b23530ec7b651b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:35:08 +0000 Subject: dgit: Transfer origs from .. to bpd when fetching This is the second half of #904878. When fetching we want to avoid downloading once again origs that are already in `..', but not in bpd. So call the facility we now have for making clones of things from `..' to bpd. `..' might contain various junk. We try to treat it with a bit of suspicion. In particular, when we have a dsc we know exactly which orig files we are looking for. So only try to link those. We don't do this transfer for debian tarballs or diffs, or for origs that would be related according to their filenames, but aren't in the dsc. This maximises the probability that fetch will succeed even if there is garbage in the `..'. (Garbage in the `..' will sometimes unavoidably cause source builds to fail, because when doing a source build we don't know what origs to expect.) Closes: #904878 Signed-off-by: Ian Jackson --- dgit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dgit b/dgit index e57f3ea..68ccc42 100755 --- a/dgit +++ b/dgit @@ -2273,6 +2273,9 @@ sub generate_commits_from_dsc () { my $upstreamv = upstreamversion $dsc->{version}; my @dfi = dsc_files_info(); + dotdot_bpd_transfer_origs $bpd_abs, $upstreamv, + sub { grep { $_->{Filename} eq $_[0] } @dfi }; + foreach my $fi (@dfi) { my $f = $fi->{Filename}; die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#; -- cgit v1.2.3 From df8e84c712a62c700be66d030539482647492db1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:40:14 +0000 Subject: test suite: Test that we can copy an orig from bpd Manually move just the .orig from the bpd to `..'. Then check that when we are done they are (links to) the same file. Signed-off-by: Ian Jackson --- tests/tests/push-buildproductsdir | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/tests/push-buildproductsdir b/tests/tests/push-buildproductsdir index 505d105..cc1c5e2 100755 --- a/tests/tests/push-buildproductsdir +++ b/tests/tests/push-buildproductsdir @@ -22,10 +22,18 @@ t-dgit --dpkg-buildpackage:-d build cd .. mkdir bpd mv $p*_* bpd/ +mv bpd/*orig* . cd $p t-dgit --build-products-dir=../bpd push t-pushed-good dgit/sid +cd .. +for f in ${p}_*.orig.*; do + in_ddd=$( stat -c %D:%i -L $f ) + in_bpd=$( stat -c %D:%i -L bpd/$f ) + test $in_ddd = $in_bpd +done + t-ok -- cgit v1.2.3 From 27d11a904dc6bdcfcea7d692bbc7353e12a38af1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:41:48 +0000 Subject: dgit: dotdot_bpd_transfer_origs: Change if to early return This drops an indentation level. No functional change. Signed-off-by: Ian Jackson --- dgit | 92 ++++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/dgit b/dgit index 68ccc42..69f983b 100755 --- a/dgit +++ b/dgit @@ -2207,60 +2207,60 @@ sub dotdot_bpd_transfer_origs ($$$) { my ($bpd_abs, $upstreamversion, $wanted) = @_; # checks is_orig_file_of_vsn and if # calls $wanted->{$leaf} and expects boolish - my $warned; - if ($buildproductsdir ne '..') { - my $dotdot = $maindir; - $dotdot =~ s{/[^/]+$}{}; - opendir DD, $dotdot or fail "opendir .. ($dotdot): $!"; - while ($!=0, defined(my $leaf = readdir DD)) { - { - local ($debuglevel) = $debuglevel-1; - printdebug "DD_BPD $leaf ?\n"; - } - next unless is_orig_file_of_vsn $leaf, $upstreamversion; - next unless $wanted->($leaf); - next if lstat "$bpd_abs/$leaf"; + return if $buildproductsdir eq '..'; + my $warned; + my $dotdot = $maindir; + $dotdot =~ s{/[^/]+$}{}; + opendir DD, $dotdot or fail "opendir .. ($dotdot): $!"; + while ($!=0, defined(my $leaf = readdir DD)) { + { + local ($debuglevel) = $debuglevel-1; + printdebug "DD_BPD $leaf ?\n"; + } + next unless is_orig_file_of_vsn $leaf, $upstreamversion; + next unless $wanted->($leaf); + next if lstat "$bpd_abs/$leaf"; + + print STDERR f_ + "%s: found orig(s) in .. missing from build-products-dir, transferring:\n", + $us + unless $warned++; + $! == &ENOENT or fail f_ + "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!; + lstat "$dotdot/$leaf" or fail f_ + "check orig file %s in ..: %s", $leaf, $!; + if (-l _) { + stat "$dotdot/$leaf" or fail f_ + "check targe of orig symlink %s in ..: %s", $leaf, $!; + my $ltarget = readlink "$dotdot/$leaf" or + die "readlink $dotdot/$leaf: $!"; + if ($ltarget !~ m{^/}) { + $ltarget = "$dotdot/$ltarget"; + } + symlink $ltarget, "$bpd_abs/$leaf" + or die "$ltarget $bpd_abs $leaf: $!"; print STDERR f_ -"%s: found orig(s) in .. missing from build-products-dir, transferring:\n", - $us - unless $warned++; - $! == &ENOENT or fail f_ - "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!; - lstat "$dotdot/$leaf" or fail f_ - "check orig file %s in ..: %s", $leaf, $!; - if (-l _) { - stat "$dotdot/$leaf" or fail f_ - "check targe of orig symlink %s in ..: %s", $leaf, $!; - my $ltarget = readlink "$dotdot/$leaf" or - die "readlink $dotdot/$leaf: $!"; - if ($ltarget !~ m{^/}) { - $ltarget = "$dotdot/$ltarget"; - } - symlink $ltarget, "$bpd_abs/$leaf" - or die "$ltarget $bpd_abs $leaf: $!"; - print STDERR f_ "%s: cloned orig symlink from ..: %s\n", - $us, $leaf; - } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") { - print STDERR f_ + $us, $leaf; + } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") { + print STDERR f_ "%s: hardlinked orig from ..: %s\n", - $us, $leaf; - } elsif ($! != EXDEV) { - fail f_ "failed to make %s a hardlink to %s: %s", - "$bpd_abs/$leaf", "$dotdot/$leaf", $!; - } else { - symlink "$bpd_abs/$leaf", "$dotdot/$leaf" - or die "$bpd_abs $dotdot $leaf $!"; - print STDERR f_ + $us, $leaf; + } elsif ($! != EXDEV) { + fail f_ "failed to make %s a hardlink to %s: %s", + "$bpd_abs/$leaf", "$dotdot/$leaf", $!; + } else { + symlink "$bpd_abs/$leaf", "$dotdot/$leaf" + or die "$bpd_abs $dotdot $leaf $!"; + print STDERR f_ "%s: symmlinked orig from .. on other filesystem: %s\n", - $us, $leaf; - } + $us, $leaf; } - die "$dotdot; $!" if $!; - closedir DD; } + die "$dotdot; $!" if $!; + closedir DD; } sub generate_commits_from_dsc () { -- cgit v1.2.3 From 0802b0bd3906ee36bf618cbbaa1b64a90120bcc6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 16:58:16 +0000 Subject: dgit: When reporting no such package, say `source package' This may help a bit pending a fuller fix to #844206/#870496. Signed-off-by: Ian Jackson --- dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgit b/dgit index 69f983b..b6bfd56 100755 --- a/dgit +++ b/dgit @@ -257,7 +257,7 @@ sub forceing ($) { } sub no_such_package () { - print STDERR f_ "%s: package %s does not exist in suite %s\n", + print STDERR f_ "%s: source package %s does not exist in suite %s\n", $us, $package, $isuite; finish 4; } -- cgit v1.2.3 From ed8b3338dc69463e96097de3bad257bf7dc3f725 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 17:46:38 +0000 Subject: i18n: Fix pairwise-pocheck The condition to spot only bare < did not work. Fix it. Tcl does not have look-behind assertions, so use . and a look-ahead assertion. Signed-off-by: Ian Jackson --- po4a/pairwise-pocheck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po4a/pairwise-pocheck b/po4a/pairwise-pocheck index 6a71f64..b97629b 100755 --- a/po4a/pairwise-pocheck +++ b/po4a/pairwise-pocheck @@ -54,7 +54,7 @@ proc check_msg {msgid msgstr} { global for_emsg set for_emsg "msgid=[list $msgid] msgstr=[list $msgstr]" check_equal "un-escaped non-pod < count (missing B or I?)" { - regexp -all {(?!\b[IBCLEFSXZ])\<} $m + regexp -all {(?:^!(?!\b[IBCLEFSXZ]).)\<} $m } } -- cgit v1.2.3 From 3883c115deda077efbf8f2a620b2717c07cd09da Mon Sep 17 00:00:00 2001 From: Frans Spiesschaert Date: Sun, 6 Jan 2019 17:42:03 +0000 Subject: i18n: dgit-user_7.nl.po dgit: [INTL:nl] Dutch po file for the dgit-user_7 manpage [ file copied into right place and po4a.cfg updated -iwj ] Closes: #918253 Signed-off-by: Ian Jackson --- debian/dgit.install | 4 +- po4a/dgit-user_7.nl.po | 948 +++++++++++++++++++++++++++++++++++++++++++++++++ po4a/po4a.cfg | 2 +- 3 files changed, 951 insertions(+), 3 deletions(-) create mode 100644 po4a/dgit-user_7.nl.po diff --git a/debian/dgit.install b/debian/dgit.install index 622e876..a1a6eed 100644 --- a/debian/dgit.install +++ b/debian/dgit.install @@ -1,4 +1,4 @@ usr/share/locale/*/LC_MESSAGES/dgit.mo -# usr/share/man/*/man*/dgit*.[1-9] -# ^ translated manpages. This has to be un-commented when they appear. +usr/share/man/*/man*/dgit*.[1-9] +# ^ translated manpages. This has to be commented if they should go away. diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po new file mode 100644 index 0000000..12adf1c --- /dev/null +++ b/po4a/dgit-user_7.nl.po @@ -0,0 +1,948 @@ +# Dutch translations for po package dgit-user_7 +# Copyright (C) 2018 Free Software Foundation, Inc. +# This file is distributed under the same license as the po package. +# Automatically generated, 2018. +# Frans Spiesschaert , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: dgit-user_7\n" +"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"PO-Revision-Date: 2018-11-14 21:22+0100\n" +"Last-Translator: Frans Spiesschaert \n" +"Language-Team: Debian Dutch l10n Team \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 +#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 +#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 +#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#, no-wrap +msgid "NAME" +msgstr "NAAM" + +#. type: =head1 +#: ../dgit.1:1394 ../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 +#: ../git-debrebase.5.pod:678 +#, no-wrap +msgid "SEE ALSO" +msgstr "ZIE OOK" + +#. type: =head1 +#: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35 +#, no-wrap +msgid "SUMMARY" +msgstr "SAMENVATTING" + +#. type: textblock +#: ../dgit-user.7.pod:3 +msgid "dgit-user - making and sharing changes to Debian packages, with git" +msgstr "" +"dgit-user - maken en delen van wijzigingen aan Debian-pakketten, met git" + +#. type: =head1 +#: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 +#: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 +#: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 +#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +msgid "INTRODUCTION" +msgstr "INLEIDING" + +#. type: textblock +#: ../dgit-user.7.pod:7 +msgid "" +"dgit lets you fetch the source code to every package on your system as if " +"your distro used git to maintain all of it." +msgstr "" +"dgit laat u toe de broncode van elk pakket op uw systeem op te halen alsof " +"uw distributie gebruik maakte van git om die allemaal te onderhouden." + +#. type: textblock +#: ../dgit-user.7.pod:11 +msgid "" +"You can then edit it, build updated binary packages (.debs) and install and " +"run them. You can also share your work with others." +msgstr "" +"U kunt deze broncode dan bewerken, bijgewerkte binaire pakketten (.deb's) " +"bouwen en ze installeren en uitvoeren. U kunt uw werk ook delen met anderen." + +#. type: textblock +#: ../dgit-user.7.pod:16 +msgid "" +"This tutorial gives some recipes and hints for this. It assumes you have " +"basic familiarity with git. It does not assume any initial familiarity with " +"Debian's packaging processes." +msgstr "" +"Deze handleiding geeft hiervoor enkele procedures en suggesties. Ze gaat " +"ervan uit dat u beschikt over basale noties van git. Ze veronderstelt niet " +"dat u enigszins vertrouwd bent met de processen van pakketbeheer van Debian." + +#. type: textblock +#: ../dgit-user.7.pod:21 +msgid "" +"If you are a package maintainer within Debian; a DM or DD; and/or a sponsee: " +"this tutorial is not for you. Try L, L, or L and L." +msgstr "" +"Indien u een pakketonderhouder bent binnen Debian, een Onderhouder (DM -" +"Debian Maintainer) of Ontwikkelaar (DD - Debian Developper) van Debian, en/" +"of iemand wiens werk gesponsord wordt, dan is deze handleiding niet voor u. " +"Raadpleeg in dat geval L, L, of " +"L en L." + +#. type: textblock +#: ../dgit-user.7.pod:29 +msgid "(These runes will be discussed later.)" +msgstr "(Deze runen worden later besproken.)" + +#. type: verbatim +#: ../dgit-user.7.pod:33 +#, no-wrap +msgid "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +" % curl 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +" % curl 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Reparatie van libc-bug waarbij verlies van uitvoer optreedt'\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:44 +msgid "Occasionally:" +msgstr "Sporadisch:" + +#. type: verbatim +#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:242 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % git reset --hard\n" +"\n" +msgstr "" +" % git clean -xdf\n" +" % git reset --hard\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:53 +msgid "Later:" +msgstr "Later:" + +#. type: verbatim +#: ../dgit-user.7.pod:57 +#, no-wrap +msgid "" +" % cd glibc\n" +" % dgit pull jessie,-security\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" +" % cd glibc\n" +" % dgit pull jessie,-security\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" + +#. type: =head1 +#: ../dgit-user.7.pod:65 +msgid "FINDING THE RIGHT SOURCE CODE - DGIT CLONE" +msgstr "DE JUISTE BRONCODE VINDEN - DGIT CLONE" + +#. type: verbatim +#: ../dgit-user.7.pod:69 +#, no-wrap +msgid "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +"\n" +msgstr "" +" % dgit clone glibc jessie,-security\n" +" % cd glibc\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:74 +msgid "" +"dgit clone needs to be told the source package name (which might be " +"different to the binary package name, which was the name you passed to \"apt-" +"get install\") and the codename or alias of the Debian release (this is " +"called the \"suite\")." +msgstr "" +"Aan dgit clone moet de naam van het broncodepakket opgegeven worden (die kan " +"verschillen van de naam van het binaire pakket; het was deze laatste naam " +"die u opgaf aan \"apt-get install\") en de codenaam of de alias van de " +"Debian-release (welke men de \"suite\" noemt)" + +#. type: =head2 +#: ../dgit-user.7.pod:80 +msgid "Finding the source package name" +msgstr "De naam van het broncodepakket te weten komen" + +#. type: textblock +#: ../dgit-user.7.pod:82 +msgid "" +"For many packages, the source package name is obvious. Otherwise, if you " +"know a file that's in the package, you can look it up with dpkg:" +msgstr "" +"Bij veel pakketten is de naam van het broncodepakket voor de hand liggend. " +"Anders kunt u hem opzoeken met dpkg, indien u een bestand kent dat in het " +"pakket zit:" + +#. type: verbatim +#: ../dgit-user.7.pod:88 +#, no-wrap +msgid "" +" % dpkg -S /lib/i386-linux-gnu/libc.so.6 \n" +" libc6:i386: /lib/i386-linux-gnu/libc.so.6\n" +" % dpkg -s libc6:i386\n" +" Package: libc6\n" +" Status: install ok installed\n" +" ...\n" +" Source: glibc\n" +"\n" +msgstr "" +" % dpkg -S /lib/i386-linux-gnu/libc.so.6 \n" +" libc6:i386: /lib/i386-linux-gnu/libc.so.6\n" +" % dpkg -s libc6:i386\n" +" Package (Pakket): libc6\n" +" Status (Toestand): install ok installed (geïnstalleerd)\n" +" ...\n" +" Source (Bron): glibc\n" +"\n" + +#. type: verbatim +#: ../dgit-user.7.pod:98 +#, no-wrap +msgid "" +"(In this example,\n" +"libc6 is a \"multi-arch: allowed\" package,\n" +" which means that it exists in several different builds\n" +" for different architectures.\n" +"That's where C<:i386> comes from.)\n" +"\n" +msgstr "" +"(In dit voorbeeld is\n" +"libc6 een pakket van het type \"multi-arch: allowed\",\n" +" hetgeen betekent dat het voorkomt in verschillende andere vormen/compilaties\n" +" voor verschillende architecturen.\n" +"Daarvandaan komt C<:i386>.)\n" +"\n" + +#. type: =head2 +#: ../dgit-user.7.pod:104 +msgid "Finding the Debian release (the \"suite\")" +msgstr "De Debian-release (de \"suite\") te weten komen" + +#. type: textblock +#: ../dgit-user.7.pod:106 +msgid "" +"Internally, Debian (and derived) distros normally refer to their releases by " +"codenames. Debian also has aliases which refer to the current stable " +"release etc. So for example, at the time of writing Debian C " +"(Debian 8) is Debian C; and the current version of Ubuntu is " +"C (Yakkety Yak, 16.10). You can specify either the codename " +"C or the alias C. If you don't say, you get C, which " +"is Debian C - the main work-in progress branch." +msgstr "" +"Intern verwijzen Debian (en de ervan afgeleide distributies) gewoonlijk naar " +"hun releases met een codenaam. Debian gebruikt ook aliassen die verwijzen " +"naar de huidige stabiele release, enz. Bijvoorbeeld, bij het schrijven van " +"deze handleiding was Debian C (Debian 8) Debian C (de " +"stabiele uitgave van Debian), en was de actuele versie van Ubuntu C " +"(Yakkety Yak, 16.10). U kunt zowel de codenaam C als de alias " +"C opgeven. Indien u niets opgeeft, dan krijgt u C, welke Debian " +"C is - de centrale tak van de voortgaande ontwikkeling." + +#. type: textblock +#: ../dgit-user.7.pod:117 +msgid "If you don't know what you're running, try this:" +msgstr "" +"Indien u niet weet met welke suite u werkt, kunt u het volgende gebruiken:" + +#. type: verbatim +#: ../dgit-user.7.pod:121 +#, no-wrap +msgid "" +" % grep '^deb' /etc/apt/sources.list\n" +" deb http://the.earth.li/debian/ jessie main non-free contrib\n" +" ...\n" +" %\n" +"\n" +msgstr "" +" % grep '^deb' /etc/apt/sources.list\n" +" deb http://the.earth.li/debian/ jessie main non-free contrib\n" +" ...\n" +" %\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:128 +msgid "" +"For Debian, you should add C<,-security> to the end of the suite name, " +"unless you're on unstable or testing. Hence, in our example C " +"becomes C. (Yes, with a comma.)" +msgstr "" +"Voor Debian moet u aan het eind van de naam van de suite C<,-security> " +"toevoegen, tenzij u met de suite unstable of testing werkt. Dus in ons " +"voorbeeld wordt C C. (Wel degelijk met de komma.)" + +#. type: =head1 +#: ../dgit-user.7.pod:135 +msgid "WHAT DGIT CLONE PRODUCES" +msgstr "WAT DGIT CLONE AANMAAKT" + +#. type: =head2 +#: ../dgit-user.7.pod:137 +msgid "What branches are there" +msgstr "Welke takken er zijn" + +#. type: textblock +#: ../dgit-user.7.pod:139 +msgid "" +"dgit clone will give you a new working tree, and arrange for you to be on a " +"branch named like C (yes, with a comma in the branch " +"name)." +msgstr "" +"dgit clone zal voor u een verse werkkopie aanmaken en ervoor zorgen dat u " +"zich bevindt op een tak met een naam als C " +"(inderdaad, met een komma in de naam van de tak)." + +#. type: textblock +#: ../dgit-user.7.pod:143 +msgid "" +"For each release (like C) there is a tracking branch for the " +"contents of the archive, called C (and similarly " +"for other suites). This can be updated with C. This, " +"the I, is synthesized by your local copy of dgit. It " +"is fast forwarding." +msgstr "" +"Voor elke release (zoals C) bestaat een meelopende tak voor de " +"inhoud van het archief, genoemd C (en net zo voor " +"andere suites). Deze kan bijgewerkt worden met C. Deze, " +"de I<\"remote\" suitetak>, wordt samengesteld door uw lokale kopie van dgit. " +"Een lineaire veranderingsgeschiedenis wordt opgebouwd (N.v.d.V.: fast " +"forwarding in git-terminologie)." + +#. type: textblock +#: ../dgit-user.7.pod:152 +msgid "" +"Debian separates out the security updates, into C<*-security>. Telling dgit " +"C means that it should include any updates available in " +"C. The comma notation is a request to dgit to track " +"jessie, or jessie-security if there is an update for the package there." +msgstr "" +"De veiligheidsupdates worden door Debian afgezonderd in C<*-security>. Aan " +"dgit de opdracht C geven, betekent dat het de eventueel " +"in C aanwezige updates moet opnemen. De notatie met de " +"komma houdt de vraag aan dgit in om jessie op te volgen of jessie-security " +"als zich daarin een update voor het pakket bevindt." + +#. type: textblock +#: ../dgit-user.7.pod:158 +msgid "" +"(You can also dgit fetch in a tree that wasn't made by dgit clone. If " +"there's no C you'll have to supply a C<-p>I " +"option to dgit fetch.)" +msgstr "" +"(U kunt ook het commando dgit fetch gebruiken in een mappenboom die niet " +"door git clone aangemaakt werd. Indien daarin geen C " +"aanwezig is, zult u met dgit fetch de optie C<-p>I moeten gebruiken.)" + +#. type: =head2 +#: ../dgit-user.7.pod:162 +msgid "What kind of source tree do you get" +msgstr "Welk soort broncodeboom u verkrijgt" + +#. type: textblock +#: ../dgit-user.7.pod:164 +msgid "" +"If the Debian package is based on some upstream release, the code layout " +"should be like the upstream version. You should find C helpful to " +"find where to edit." +msgstr "" +"Indien het Debian-pakket gebaseerd is op een release van een toeleveraar, " +"dan zal de indeling van de broncode eruit zien als die van de versie van de " +"toeleveraar. U kunt zich laten helpen door C om uit te zoeken waar " +"u met bewerken wilt beginnen." + +#. type: textblock +#: ../dgit-user.7.pod:168 +msgid "" +"The package's Debian metadata and the scripts for building binary packages " +"are under C. C, C and C are the starting points. The Debian Policy Manual has most of the in-" +"depth technical details." +msgstr "" +"De metagegevens van Debian over het pakket en de scripts voor het bouwen van " +"de binaire pakketten bevinden zich in C. Aanknopingspunten zijn " +"C, C en C. In het " +"beleidshandboek van Debian vindt u meestal de nodige diepgaande technische " +"informatie." + +#. type: textblock +#: ../dgit-user.7.pod:175 +msgid "" +"For many Debian packages, there will also be some things in C. It is best to ignore these. Insofar as they are relevant the changes " +"there will have been applied to the actual files, probably by means of " +"actual comments in the git history. The contents of debian/patches are " +"ignored when building binaries from dgitish git branches." +msgstr "" +"Bij veel Debian-pakketten zijn ook zaken te vinden in C. U " +"kunt deze best negeren. Voor zover deze relevant zijn, zullen deze toegepast " +"zijn in de eigenlijke bestanden, vermoedelijk via feitelijke commentaren in " +"de git-geschiedenis. Wanneer binaire pakketten gebouwd worden vanuit met " +"dgit verkregen git-takken, wordt de inhoud van debian/patches genegeerd." + +#. type: textblock +#: ../dgit-user.7.pod:185 +msgid "" +"(For Debian afficionados: the git trees that come out of dgit are \"patches-" +"applied packaging branches without a .pc directory\".)" +msgstr "" +"(Voor Debian-ingewijden: de git-boomstructuren die met dgit verkregen worden " +"zijn \"verpakkingstakken met toegepaste patches, maar zonder .pc-map\".)" + +#. type: =head2 +#: ../dgit-user.7.pod:190 +msgid "What kind of history you get" +msgstr "Welk soort geschiedenis u verkrijgt" + +#. type: textblock +#: ../dgit-user.7.pod:192 +msgid "" +"If you're lucky, the history will be a version of, or based on, the Debian " +"maintainer's own git history, or upstream's git history." +msgstr "" +"Indien u geluk heeft, zal de geschiedenis een versie zijn van, of gebaseerd " +"zijn op de eigen git-geschiedenis van de pakketonderhouder van Debian, of " +"van de git-geschiedenis van de toeleveraar." + +#. type: textblock +#: ../dgit-user.7.pod:197 +msgid "" +"But for many packages the real git history does not exist, or has not been " +"published in a dgitish form. So you may find that the history is a rather " +"short history invented by dgit." +msgstr "" +"Maar van veel pakketten bestaat geen echte git-geschiedenis of werd die niet " +"in een dgit-achtige vorm gepubliceerd. Het is dus mogelijk dat u vaststelt " +"dat de geschiedenis eerder kort is en door dgit bedacht." + +#. type: textblock +#: ../dgit-user.7.pod:203 +msgid "" +"dgit histories often contain automatically-generated commits, including " +"commits which make no changes but just serve to make a rebasing branch fast-" +"forward. This is particularly true of combining branches like C." +msgstr "" +"dgit-geschiedenissen bevatten vaak automatisch gegenereerde vastleggingen " +"(commits), met inbegrip van vastleggingen die geen wijzigingen aanbrengen, " +"maar enkel dienen om een zich herintegrerende aftakking in te passen in de " +"lineaire vorm van de veranderingsgeschiedenis (N.v.d.V.: \"make a rebasing " +"branch fast-forward\" in git-terminologie). Dit is in het bijzonder het " +"geval bij gecombineerde takken zoals C." + +#. type: textblock +#: ../dgit-user.7.pod:210 +msgid "" +"If the package maintainer is using git then after dgit clone you may find " +"that there is a useful C remote referring to the Debian package " +"maintainer's repository for the package. You can see what's there with " +"C. But use what you find there with care: Debian " +"maintainers' git repositories often have contents which are very confusing " +"and idiosyncratic. In particular, you may need to manually apply the " +"patches that are in debian/patches before you do anything else!" +msgstr "" +"Indien de pakketonderhouder gebruik maakt van git, dan kunt u na een dgit " +"clone een handig C remote opmerken, wat verwijst naar het git-" +"archief waarvan de pakketonderhouder gebruik maakt voor het pakket. U kunt " +"zien wat zich daar bevindt met C. Maar gebruik wat u daar " +"vindt met zorg: de git-archieven van onderhouders van Debian bevatten vaak " +"zaken die erg verwarrend en zonderling kunnen zijn. In het bijzonder zult u " +"mogelijk handmatig de patches moeten toepassen die zich in debian/patches " +"bevinden voor u iets anders doet!" + +#. type: =head1 +#: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56 +msgid "BUILDING" +msgstr "BOUWPROCES" + +#. type: =head2 +#: ../dgit-user.7.pod:224 +msgid "Always commit before building" +msgstr "" +"Leg steeds veranderingen vast (N.v.d.V.: \"commit\" in git-terminologie) " +"voor u begint te bouwen" + +#. type: verbatim +#: ../dgit-user.7.pod:228 +#, no-wrap +msgid "" +" % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +"\n" +msgstr "" +" % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Reparatie van libc-bug waarbij verlies van uitvoer optreedt'\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:233 +msgid "" +"Debian package builds are often quite messy: they may modify files which are " +"also committed to git, or leave outputs and temporary files not covered by " +"C<.gitignore>." +msgstr "" +"Het bouwproces van een Debian-pakket verloopt vaak erg rommelig: het kan " +"bestanden wijzigen die ook vastgelegd zijn in git of uitvoer en tijdelijke " +"bestanden achterlaten die niet door C<.gitignore> afgedekt zijn." + +#. type: textblock +#: ../dgit-user.7.pod:237 +msgid "If you always commit, you can use" +msgstr "Indien u steeds een vastlegging doet, kunt u gebruik maken van" + +#. type: textblock +#: ../dgit-user.7.pod:247 +msgid "" +"to tidy up after a build. (If you forgot to commit, don't use those " +"commands; instead, you may find that you can use C to help " +"commit what you actually wanted to keep.)" +msgstr "" +"om na het bouwproces een opruimactie te doen. (Indien u vergat vast te " +"leggen, gebruik dan deze commando's niet; in de plaats kunt u misschien " +"C gebruiken om te helpen vastleggen wat u werkelijk wenst te " +"bewaren.)" + +#. type: textblock +#: ../dgit-user.7.pod:252 +msgid "" +"These are destructive commands which delete all new files (so you B " +"remember to say C) and throw away edits to every file (so you " +"B remember to commit)." +msgstr "" +"Dit zijn verwoestende commando's die alle nieuwe bestanden wissen (dus " +"B u eraan denken om C) uit te voeren) en elke aanpassing aan " +"een bestand weggooien (u B er dus aan denken om een vastlegging uit te " +"voeren)." + +#. type: =head2 +#: ../dgit-user.7.pod:257 +msgid "Update the changelog (at least once) before building" +msgstr "Werk het bestand changelog (minstens eenmaal) bij voor u bouwt" + +#. type: verbatim +#: ../dgit-user.7.pod:261 +#, no-wrap +msgid "" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +"\n" +msgstr "" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:265 +msgid "" +"The binaries you build will have a version number which ultimately comes " +"from the C. You want to be able to tell your binaries " +"apart from your distro's." +msgstr "" +"De binaire pakketten welke u bouwt zullen een versienummer hebben dat " +"uiteindelijk afkomstig is uit het bestand C. U wilt toch " +"uw binaire pakketten kunnen onderscheiden van die van uw distributie." + +#. type: textblock +#: ../dgit-user.7.pod:270 +msgid "" +"So you should update C to add a new stanza at the top, for " +"your build." +msgstr "" +"En dus moet u C bijwerken en er bovenaan een item " +"toevoegen voor u de bouw uitvoert." + +#. type: textblock +#: ../dgit-user.7.pod:274 +msgid "" +"This rune provides an easy way to do this. It adds a new changelog entry " +"with an uninformative message and a plausible version number (containing a " +"bit of your git commit id)." +msgstr "" +"Deze rune geeft een makkelijke manier om dit te doen. Het voegt een nieuw " +"item toe aan changelog met een niet-informatieve mededeling en een plausibel " +"versienummer (dat een stukje van het id van uw vastlegging bevat)." + +#. type: textblock +#: ../dgit-user.7.pod:279 +msgid "" +"If you want to be more sophisticated, the package C has a good " +"Emacs mode for editing changelogs. Alternatively, you could edit the " +"changelog with another text editor, or run C or C with " +"different options. Choosing a good version number is slightly tricky and a " +"complete treatment is beyond the scope of this tutorial." +msgstr "" +"Indien u een meer gesofisticeerde manier wilt, biedt het pakket C een goede Emacs-modus voor het bewerken van changelogs. U kunt anders de " +"changelog ook bewerken met een andere teksteditor, of C of C " +"uitvoeren met verschillende opties. Het kiezen van een goed versienummer is " +"een beetje een netelige kwestie en een volledige behandeling van dit " +"onderwerp valt buiten het bestek van deze handleiding." + +#. type: =head2 +#: ../dgit-user.7.pod:287 +msgid "Actually building" +msgstr "Het eigenlijke bouwen" + +#. type: verbatim +#: ../dgit-user.7.pod:291 +#, no-wrap +msgid "" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +"\n" +msgstr "" +" % mk-build-deps --root-cmd=sudo --install\n" +" % dpkg-buildpackage -uc -b\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:296 +msgid "" +"dpkg-buildpackage is the primary tool for building a Debian source package. " +"C<-uc> means not to pgp-sign the results. C<-b> means build all binary " +"packages, but not to build a source package." +msgstr "" +"dpkg-buildpackage is het belangrijkste gereedschap voor het bouwen van een " +"Debian-broncodepakket. C<-uc> betekent: geen pgp-ondertekening toevoegen aan " +"de resultaten. C<-b> betekent: alle binaire pakketten bouwen, maar geen " +"broncodepakket." + +#. type: =head2 +#: ../dgit-user.7.pod:302 +msgid "Using sbuild" +msgstr "Gebruik maken van sbuild" + +#. type: textblock +#: ../dgit-user.7.pod:304 +msgid "" +"You can build in an schroot chroot, with sbuild, instead of in your main " +"environment. (sbuild is used by the Debian build daemons.)" +msgstr "" +"In plaats van in uw hoofdomgeving, kunt u de bouw uitvoeren in een \"schroot " +"chroot\" met sbuild (sbuild wordt door de build-achtergronddiensten van " +"Debian gebruikt.)" + +#. type: verbatim +#: ../dgit-user.7.pod:309 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % sbuild -c jessie -A --no-clean-source \\\n" +" --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +"\n" +msgstr "" +" % git clean -xdf\n" +" % sbuild -c jessie -A --no-clean-source \\\n" +" --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:315 +msgid "" +"Note that this will seem to leave a \"source package\" (.dsc and .tar.gz) " +"in the parent directory, but that source package should not be used. It is " +"likely to be broken. For more information see Debian bug #868527." +msgstr "" +"Merk op dat dit een \"broncodepakket\" (.dsc en .tar.gz) lijkt achter te " +"laten in de bovenliggende map, maar u moet dit broncodepakket niet " +"gebruiken. Waarschijnlijk is het defect. Zie voor bijkomende informatie " +"Debian-bug #868527." + +#. type: =head1 +#: ../dgit-user.7.pod:322 +msgid "INSTALLING" +msgstr "INSTALLEREN" + +#. type: =head2 +#: ../dgit-user.7.pod:324 +msgid "Debian Jessie or older" +msgstr "Debian Jessie of eerder" + +#. type: verbatim +#: ../dgit-user.7.pod:328 +#, no-wrap +msgid "" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:332 +msgid "" +"You can use C to install the .debs that came out of your package." +msgstr "" +"U kunt C gebruiken om de .deb-bestanden te installeren die uit uw " +"pakket voortkwamen." + +#. type: textblock +#: ../dgit-user.7.pod:335 +msgid "" +"If the dependencies aren't installed, you will get an error, which can " +"usually be fixed with C." +msgstr "" +"Indien de vereisten niet geïnstalleerd zijn, zult u een foutmelding krijgen " +"die gewoonlijk gerepareerd kan worden met C." + +#. type: =head2 +#: ../dgit-user.7.pod:339 +msgid "Debian Stretch or newer" +msgstr "Debian Stretch of later" + +#. type: verbatim +#: ../dgit-user.7.pod:343 +#, no-wrap +msgid "" +" % sudo apt install ../libc6_*.deb\n" +"\n" +msgstr "" +" % sudo apt install ../libc6_*.deb\n" +"\n" + +#. type: =head1 +#: ../dgit-user.7.pod:347 +msgid "Multiarch" +msgstr "Multiarch" + +#. type: textblock +#: ../dgit-user.7.pod:349 +msgid "" +"If you're working on a library package and your system has multiple " +"architectures enabled, you may see something like this:" +msgstr "" +"Indien u aan een bibliotheekpakket werkt en op uw systeem multi-" +"architectuurondersteuning geactiveerd is, krijgt u mogelijk iets te zien als " +"dit:" + +#. type: verbatim +#: ../dgit-user.7.pod:355 +#, no-wrap +msgid "" +" dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" +" package libpcre3-dev:amd64 2:8.39-3~3.gbp8f25f5 cannot be configured because libpcre3-dev:i386 is at a different version (2:8.39-2)\n" +"\n" +msgstr "" +" dpkg: fout bij verwerken van pakket libpcre3-dev:amd64 (--configure):\n" +" pakket libpcre3-dev:amd64 2:8.39-3~3.gbp8f25f5 kan niet geconfigureerd worden omdat libpcre3-dev:i386 een andere versie (2:8.39-2) heeft\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:360 +msgid "" +"The multiarch system used by Debian requires each package which is present " +"for multiple architectures to be exactly the same across all the " +"architectures for which it is installed." +msgstr "" +"Het multi-architectuursysteem dat door Debian toegepast wordt, vereist dat " +"elk pakket dat voor meerdere architecturen aanwezig is, exact hetzelfde is " +"bij alle architecturen waarvoor het geïnstalleerd is." + +#. type: textblock +#: ../dgit-user.7.pod:364 +msgid "" +"The proper solution is to build the package for all the architectures you " +"have enabled. You'll need a chroot for each of the secondary " +"architectures. This is somewhat tiresome, even though Debian has excellent " +"tools for managing chroots. C from the " +"package of the same name and C from the C " +"package are good starting points." +msgstr "" +"De geëigende oplossing is om het pakket te bouwen voor alle architecturen " +"die u geactiveerd heeft. U zult een chroot nodig hebben voor elk van de " +"secundaire architecturen. Dit is enigszins vermoeiend, ook al beschikt " +"Debian over uitstekende hulpmiddelen voor het beheren van chroots. Goede " +"aanknopingspunten zijn C uit het pakket met " +"dezelfde naam en C uit het pakket C." + +#. type: textblock +#: ../dgit-user.7.pod:374 +msgid "" +"Otherwise you could deinstall the packages of interest for those other " +"architectures with something like C." +msgstr "" +"Een andere mogelijkheid is dat u de betreffende pakketten bij de andere " +"architecturen de-installeert met iets zoals C." + +#. type: textblock +#: ../dgit-user.7.pod:378 +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 - 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 "" +"Indien geen van beide mogelijkheden een optie is, dan is een mogelijke " +"laatste wanhoopsdaad, voor uw eigen pakket hetzelfde versienummer gebruiken " +"als van het officiële pakket. Dit is niet ideaal omdat dit het moeilijk " +"maakt om te weten wat geïnstalleerd is, en omdat het apt zal misleiden en in " +"de war brengen." + +#. type: textblock +#: ../dgit-user.7.pod:386 +msgid "With the \"same number\" approach you may still get errors like" +msgstr "" +"Met de \"hetzelfde-nummer\"-benadering kunt u nog steeds foutmeldingen " +"krijgen zoals" + +#. type: textblock +#: ../dgit-user.7.pod:390 +msgid "" +"trying to overwrite shared '/usr/include/pcreposix.h', which is different " +"from other instances of package libpcre3-dev" +msgstr "" +"poging tot overschrijven van gedeelde '/usr/include/pcreposix.h', welke " +"verschilt van andere exemplaren van pakket libpcre3-dev" + +#. type: textblock +#: ../dgit-user.7.pod:394 +msgid "" +"but passing C<--force-overwrite> to dpkg will help - assuming you know what " +"you're doing." +msgstr "" +"maar de optie C<--force-overwrite> meegeven aan dpkg zal helpen - in de " +"veronderstelling dat u weet wat u doet." + +#. type: =head1 +#: ../dgit-user.7.pod:397 +msgid "SHARING YOUR WORK" +msgstr "UW WERK DELEN" + +#. type: textblock +#: ../dgit-user.7.pod:399 +msgid "" +"The C branch (or whatever) is a normal git branch. " +"You can use C to publish it on any suitable git server." +msgstr "" +"De tak C (of wat dan ook) is een gewone git-tak. U " +"kunt C gebruiken om hem te publiceren op elke geschikte git-server." + +#. type: textblock +#: ../dgit-user.7.pod:402 +msgid "" +"Anyone who gets that git branch from you will be able to build binary " +"packages (.deb) just as you did." +msgstr "" +"Iedereen die deze git-tak van u krijgt, zal in staat zijn om binaire " +"pakketten (.deb) te bouwen, zoals u het deed." + +#. type: textblock +#: ../dgit-user.7.pod:406 +msgid "" +"If you want to contribute your changes back to Debian, you should probably " +"send them as attachments to an email to the L (either a followup to an existing bug, or a new bug). Patches " +"in C format are usually very welcome." +msgstr "" +"Indien u uw wijzigingen terug wilt bijdragen aan Debian, dan zult u ze " +"wellicht als bijlage bij een e-mail moeten sturen naar het L (ofwel als opvolging van een " +"bestaande bug, of als een nieuwe bug). Patches in de indeling C zijn gewoonlijk erg welkom." + +#. type: =head2 +#: ../dgit-user.7.pod:413 +msgid "Source packages" +msgstr "Broncodepakketten" + +#. type: textblock +#: ../dgit-user.7.pod:415 +msgid "" +"The git branch is not sufficient to build a source package the way Debian " +"does. Source packages are somewhat awkward to work with. Indeed many " +"plausible git histories or git trees cannot be converted into a suitable " +"source package. So I recommend you share your git branch instead." +msgstr "" +"De git-tak volstaat niet om een broncodepakket te bouwen volgens de manier " +"van Debian. Broncodepakketten zijn wat lastig om ermee te werken. Vele " +"aannemelijke git-geschiedenissen of git-bomen kunnen namelijk niet omgezet " +"worden naar een geschikt broncodepakket. Dus beveel ik aan om in de plaats " +"daarvan uw git-tak te delen." + +#. type: textblock +#: ../dgit-user.7.pod:423 +msgid "" +"If a git branch is not enough, and you need to provide a source package but " +"don't care about its format/layout (for example because some software you " +"have consumes source packages, not git histories) you can use this recipe " +"to generate a C<3.0 (native)> source package, which is just a tarball with " +"accompanying .dsc metadata file:" +msgstr "" +"Indien een git-tak niet voldoende is en u een broncodepakket moet " +"aanleveren, maar het formaat/de indeling ervan niet van belang is " +"(bijvoorbeeld omdat u bepaalde software heeft die met broncodepakketten " +"werkt en niet met git-geschiedenissen), kunt u deze methode gebruiken om een " +"broncodepakket van het type C<3.0 (native)> te genereren. Dit is niet meer " +"dan een tar-archief met een bijhorend .dsc-metadatabestand:" + +#. type: verbatim +#: ../dgit-user.7.pod:434 +#, no-wrap +msgid "" +" % echo '3.0 (native)' >debian/source/format\n" +" % git commit -m 'switch to native source format' debian/source/format\n" +" % dgit -wgf build-source\n" +"\n" +msgstr "" +" % echo '3.0 (native)' >debian/source/format\n" +" % git commit -m 'overgang naar de broncode-indeling native' debian/source/format\n" +" % dgit -wgf build-source\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:440 +msgid "" +"If you need to provide a good-looking source package, be prepared for a lot " +"more work. You will need to read much more, perhaps starting with L, L or L" +msgstr "" +"Indien u een goed ogend broncodepakket moet aanleveren, dan zult u bereid " +"moeten zijn er heel wat meer werk in te investeren. U zult heel wat meer " +"moeten lezen, misschien te beginnen bij L, L of L" + +#. type: textblock +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 +#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +msgid "dgit(1), dgit(7)" +msgstr "dgit(1), dgit(7)" diff --git a/po4a/po4a.cfg b/po4a/po4a.cfg index 15e7f55..f296e4c 100644 --- a/po4a/po4a.cfg +++ b/po4a/po4a.cfg @@ -1,4 +1,4 @@ -[po4a_langs] +[po4a_langs] nl # ^ add your language here (separate with spaces) # Do not edit the rest of this file. It is automatically maintained. -- cgit v1.2.3 From c04d543f26f9fe7fa7d52573f99ab1f7662c4c72 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 17:44:20 +0000 Subject: dgit-user(7): Fix formatting error in comment about multi-arch These lines should not be indented. That makes them format oddly. Signed-off-by: Ian Jackson --- dgit-user.7.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit-user.7.pod b/dgit-user.7.pod index 5713064..036d5bb 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -97,8 +97,8 @@ you can look it up with dpkg: (In this example, libc6 is a "multi-arch: allowed" package, - which means that it exists in several different builds - for different architectures. +which means that it exists in several different builds +for different architectures. That's where C<:i386> comes from.) =head2 Finding the Debian release (the "suite") -- cgit v1.2.3 From 41e963b527bfd4a8913533c6ece5f7780ec23305 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 17:45:52 +0000 Subject: i18n: Unfuzz the dgit-user(7).nl manpage Signed-off-by: Ian Jackson --- po4a/dgit-user_7.nl.po | 28 ++++++++++++---------------- po4a/dgit-user_7.pot | 20 ++++++++------------ 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po index 12adf1c..15166a7 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: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-01-06 17:14+0000\n" "PO-Revision-Date: 2018-11-14 21:22+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -29,11 +29,11 @@ msgid "NAME" msgstr "NAAM" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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" @@ -237,23 +237,19 @@ msgstr "" " Source (Bron): glibc\n" "\n" -#. type: verbatim +#. type: textblock #: ../dgit-user.7.pod:98 -#, no-wrap msgid "" -"(In this example,\n" -"libc6 is a \"multi-arch: allowed\" package,\n" -" which means that it exists in several different builds\n" -" for different architectures.\n" -"That's where C<:i386> comes from.)\n" -"\n" +"(In this example, libc6 is a \"multi-arch: allowed\" package, which means " +"that it exists in several different builds for different architectures. " +"That's where C<:i386> comes from.)" msgstr "" "(In dit voorbeeld is\n" "libc6 een pakket van het type \"multi-arch: allowed\",\n" -" hetgeen betekent dat het voorkomt in verschillende andere vormen/compilaties\n" -" voor verschillende architecturen.\n" -"Daarvandaan komt C<:i386>.)\n" -"\n" +"hetgeen betekent dat het voorkomt in verschillende andere vormen/" +"compilaties\n" +"voor verschillende architecturen.\n" +"Daarvandaan komt C<:i386>.)" #. type: =head2 #: ../dgit-user.7.pod:104 diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot index 7ef68ed..5426aef 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: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-01-06 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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" @@ -186,16 +186,12 @@ msgid "" "\n" msgstr "" -#. type: verbatim +#. type: textblock #: ../dgit-user.7.pod:98 -#, no-wrap msgid "" -"(In this example,\n" -"libc6 is a \"multi-arch: allowed\" package,\n" -" which means that it exists in several different builds\n" -" for different architectures.\n" -"That's where C<:i386> comes from.)\n" -"\n" +"(In this example, libc6 is a \"multi-arch: allowed\" package, which means " +"that it exists in several different builds for different architectures. " +"That's where C<:i386> comes from.)" msgstr "" #. type: =head2 -- cgit v1.2.3 From f4a1dfadf1ccc71aaab1a63fb4418c1ceba0710d Mon Sep 17 00:00:00 2001 From: Frans Spiesschaert Date: Sun, 6 Jan 2019 17:48:18 +0000 Subject: i18n: Dutch message translations dgit: [INTL:nl] Dutch po file for the dgit package Signed-off-by: Frans Spiesschaert --- po/nl.po | 3227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3227 insertions(+) create mode 100644 po/nl.po diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..6d62a8d --- /dev/null +++ b/po/nl.po @@ -0,0 +1,3227 @@ +# Dutch translation of dgit. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the dgit package. +# FIRST AUTHOR , YEAR. +# Frans Spiesschaert , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: dgit_8.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-10-13 19:41+0000\n" +"PO-Revision-Date: 2018-12-05 20:40+0100\n" +"Last-Translator: Frans Spiesschaert \n" +"Language-Team: Debian Dutch l10n Team \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" + +#: ../dgit:240 +#, perl-format +msgid "%s: invalid configuration: %s\n" +msgstr "%s: ongeldige configuratie: %s\n" + +#: ../dgit:247 +msgid "warning: overriding problem due to --force:\n" +msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" + +#: ../dgit:255 +#, 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 +#, perl-format +msgid "%s: package %s does not exist in suite %s\n" +msgstr "%s: pakket %s bestaat niet in suite %s\n" + +#: ../dgit:483 +#, perl-format +msgid "build host child %s" +msgstr "bouwcomputer-dochter %s" + +#: ../dgit:488 ../dgit:494 +#, perl-format +msgid "connection lost: %s" +msgstr "verbinding verbroken: %s" + +#: ../dgit:489 +#, perl-format +msgid "protocol violation; %s not expected" +msgstr "protocolschending; %s werd niet verwacht" + +#: ../dgit:497 +#, perl-format +msgid "eof (reading %s)" +msgstr "eof (bij het lezen van %s)" + +#: ../dgit:504 +msgid "protocol message" +msgstr "protocolbericht" + +#: ../dgit:512 +#, perl-format +msgid "`%s'" +msgstr "`%s'" + +#: ../dgit:533 +msgid "bad byte count" +msgstr "aantal slechte bytes" + +#: ../dgit:536 +msgid "data block" +msgstr "gegevensblok" + +#: ../dgit:617 +#, perl-format +msgid "failed to fetch %s: %s" +msgstr "ophalen (fetch) van %s mislukt: %s" + +#: ../dgit:629 +#, perl-format +msgid "%s ok: %s" +msgstr "%s oké: %s" + +#: ../dgit:631 +#, perl-format +msgid "would be ok: %s (but dry run only)" +msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" + +#: ../dgit:656 +msgid "" +"main usages:\n" +" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" +" dgit [dgit-opts] fetch|pull [dgit-opts] [suite]\n" +" dgit [dgit-opts] build [dpkg-buildpackage-opts]\n" +" dgit [dgit-opts] sbuild [sbuild-opts]\n" +" dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]\n" +" dgit [dgit-opts] push [dgit-opts] [suite]\n" +" dgit [dgit-opts] push-source [dgit-opts] [suite]\n" +" dgit [dgit-opts] rpush build-host:build-dir ...\n" +"important dgit options:\n" +" -k sign tag and package with instead of default\n" +" --dry-run -n do not change anything, but go through the motions\n" +" --damp-run -L like --dry-run but make local changes, without " +"signing\n" +" --new -N allow introducing a new package\n" +" --debug -D increase debug level\n" +" -c= set git config option (used directly by dgit too)\n" +msgstr "" +"belangrijkste toepassingen:\n" +" dgit [dgit-opties] clone [dgit-opties] pakket [suite] [./map|/map]\n" +" dgit [dgit-opties] fetch|pull [dgit-opties] [suite]\n" +" dgit [dgit-opties] build [dpkg-buildpackage-opties]\n" +" dgit [dgit-opties] sbuild [sbuild-opties]\n" +" dgit [dgit-opties] pbuilder|cowbuilder [debbuild-opties]\n" +" dgit [dgit-opties] push [dgit-opties] [suite]\n" +" dgit [dgit-opties] push-source [dgit-opties] [suite]\n" +" dgit [dgit-opties] rpush bouw-computer:bouw-map ...\n" +"belangrijke dgit-opties:\n" +" -k tag en pakket ondertekenen met \n" +" in plaats van met de standaard\n" +" --dry-run -n niets wijzigen, maar de bewerkingen doorlopen\n" +" --damp-run -L zoals --dry-run maar lokale wijzigingen maken,\n" +" zonder te ondertekenen\n" +" --new -N introductie van een nieuw pakket toelaten\n" +" --debug -D debug-niveau verhogen\n" +" -c= configuratieoptie instellen voor git\n" +" (ook rechtstreeks gebruikt door dgit)\n" + +#: ../dgit:675 +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 +#, perl-format +msgid "" +"%s: %s\n" +"%s" +msgstr "" +"%s: %s\n" +"%s" + +#: ../dgit:684 +msgid "too few arguments" +msgstr "te weinig argumenten" + +#: ../dgit:795 +#, perl-format +msgid "multiple values for %s (in %s git config)" +msgstr "verschillende waarden voor %s (in %s git config)" + +#: ../dgit:798 +#, 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 +#, perl-format +msgid "" +"need value for one of: %s\n" +"%s: distro or suite appears not to be (properly) supported" +msgstr "" +"heb waarde nodig voor één van: %s\n" +"%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" + +#: ../dgit:859 +#, 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 +#, perl-format +msgid "backports-quirk needs % or ( )" +msgstr "backports-spitsvondigheid vereist % of ( )" + +#: ../dgit:890 +#, 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 +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 +msgid "internal error" +msgstr "interne fout" + +#: ../dgit:921 +msgid "pushing but distro is configured readonly" +msgstr "" +"bezig een push uit te voeren, maar de distributie is voor alleen-lezen " +"geconfigureerd" + +#: ../dgit:925 +msgid "" +"Push failed, before we got started.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:1090 +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 +#, perl-format +msgid "" +"config requested specific TLS key but do not know how to get curl to use " +"exactly that EE key (%s)" +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 +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 +msgid "curl failed to print 3-digit HTTP code" +msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" + +#: ../dgit:1169 +#, perl-format +msgid "fetch of %s gave HTTP code %s" +msgstr "een fetch van %s gaf HTTP-code %s" + +#: ../dgit:1185 +#, perl-format +msgid "unknown suite %s, maybe -d would help" +msgstr "onbekende suite %s, misschien is -d nuttig" + +#: ../dgit:1189 +#, perl-format +msgid "multiple matches for suite %s\n" +msgstr "meerdere overeenkomsten met suite %s\n" + +#: ../dgit:1191 +#, perl-format +msgid "suite %s info has no codename\n" +msgstr "info over suite %s bevat geen codenaam\n" + +#: ../dgit:1193 +#, perl-format +msgid "suite %s maps to bad codename\n" +msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" + +#: ../dgit:1195 ../dgit:1220 +msgid "bad ftpmaster api response: " +msgstr "verkeerd antwoord van de ftpmaster api:" + +#: ../dgit:1209 +#, perl-format +msgid "bad version: %s\n" +msgstr "verkeerde versie: %s\n" + +#: ../dgit:1211 +msgid "bad component" +msgstr "verkeerde component" + +#: ../dgit:1214 +msgid "bad filename" +msgstr "verkeerde bestandsnaam" + +#: ../dgit:1216 +msgid "bad sha256sum" +msgstr "verkeerde sha256sum" + +#: ../dgit:1267 +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 +#, perl-format +msgid "" +"apt seemed to not to update dgit's cached Release files for %s.\n" +"(Perhaps %s\n" +" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" +msgstr "" +"blijkbaar werkte apt de gecachete Release-bestanden van dgit voor %s niet " +"bij.\n" +"(Misschien bevindt %s\n" +" zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " +"het geval zijn, gebruik dan `relatime'.)\n" + +#: ../dgit:1373 +#, perl-format +msgid "Release file (%s) specifies intolerable %s" +msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" + +#: ../dgit:1401 +msgid "apt-get source did not produce a .dsc" +msgstr "apt-get source produceerde geen .dsc-bestand" + +#: ../dgit:1402 +#, perl-format +msgid "apt-get source produced several .dscs (%s)" +msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" + +#: ../dgit:1507 +#, perl-format +msgid "" +"unable to canonicalise suite using package %s which does not appear to exist " +"in suite %s; --existing-package may help" +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 +#, perl-format +msgid "cannot operate on %s suite" +msgstr "kan geen acties uitvoeren op suite %s" + +#: ../dgit:1701 +#, perl-format +msgid "canonical suite name for %s is %s" +msgstr "de gebruikelijke suitenaam voor %s is %s" + +#: ../dgit:1703 +#, perl-format +msgid "canonical suite name is %s" +msgstr "de gebruikelijke suitenaam is %s" + +#: ../dgit:1723 +#, 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 +#, perl-format +msgid "unsupported source format %s, sorry" +msgstr "niet-ondersteunde broncode-indeling %s, sorry" + +#: ../dgit:1756 +#, perl-format +msgid "diverting to %s (using config for %s)" +msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" + +#: ../dgit:1773 +msgid "unexpected results from git check query - " +msgstr "het verzoek git check leverde onverwachte resultaten op - " + +#: ../dgit:1788 +#, perl-format +msgid "unknown git-check `%s'" +msgstr "onbekende git-check `%s'" + +#: ../dgit:1803 +#, perl-format +msgid "unknown git-create `%s'" +msgstr "onbekende git-create `%s'" + +#: ../dgit:1840 +#, perl-format +msgid "%s: warning: removing from %s: %s\n" +msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" + +#: ../dgit:1886 +#, perl-format +msgid "could not parse .dsc %s line `%s'" +msgstr "kon .dsc %s regel `%s' niet ontleden" + +#: ../dgit:1897 +#, perl-format +msgid "missing any supported Checksums-* or Files field in %s" +msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" + +#: ../dgit:1943 +#, 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 +#, perl-format +msgid "file list in %s varies between hash fields!" +msgstr "bestandenlijst in %s varieert tussen hash-velden!" + +#: ../dgit:1956 +#, perl-format +msgid "%s has no files list field(s)" +msgstr "%s bevat geen veld(en) met een bestandenlijst" + +#: ../dgit:1962 +#, 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 +#, perl-format +msgid "purportedly source-only changes polluted by %s\n" +msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" + +#: ../dgit:2015 +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 +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 +#, perl-format +msgid ".dsc %s missing entry for %s" +msgstr ".dsc %s mist een item voor %s" + +#: ../dgit:2049 +#, perl-format +msgid "%s: %s (archive) != %s (local .dsc)" +msgstr "%s: %s (archief) != %s (lokale .dsc)" + +#: ../dgit:2057 +#, perl-format +msgid "archive %s: %s" +msgstr "archief %s: %s" + +#: ../dgit:2064 +#, perl-format +msgid "archive contains %s with different checksum" +msgstr "archief bevat %s met een andere checksum" + +#: ../dgit:2092 +#, 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 +#, perl-format +msgid "[new .changes left in %s]" +msgstr "[nieuwe .changes achtergelaten in %s]" + +#: ../dgit:2103 +#, perl-format +msgid "%s already has appropriate .orig(s) (if any)" +msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" + +#: ../dgit:2127 +#, perl-format +msgid "" +"unexpected commit author line format `%s' (was generated from changelog " +"Maintainer field)" +msgstr "" +"onverwachte indeling `%s' van de auteursregel van de commit (werd " +"gegenereerd uit het Maintainer-veld in changelog)" + +#: ../dgit:2150 +msgid "" +"\n" +"Unfortunately, this source package uses a feature of dpkg-source where\n" +"the same source package unpacks to different source code on different\n" +"distros. dgit cannot safely operate on such packages on affected\n" +"distros, because the meaning of source packages is not stable.\n" +"\n" +"Please ask the distro/maintainer to remove the distro-specific series\n" +"files and use a different technique (if necessary, uploading actually\n" +"different packages, if different distros are supposed to have\n" +"different code).\n" +"\n" +msgstr "" +"\n" +"Jammer genoeg gebruikt dit broncodepakket een functionaliteit van dpkg-" +"source waarbij hetzelfde broncodepakket uitgepakt wordt tot andere broncode " +"bij verschillende distributies. dgit is op de betreffende distributies niet " +"in staat om betrouwbaar te werken met dergelijke pakketten, aangezien de " +"bedoeling van de broncodepakketten niet stabiel is.\n" +"\n" +"Vraag de distributie/pakketonderhouder om de distributiespecifieke reeks " +"bestanden te verwijderen en een andere techniek te gebruiken (zo nodig " +"daadwerkelijk verschillende pakketten uploaden indien het de bedoeling is " +"dat verschillende distributies andere broncode hebben).\n" +"\n" + +#: ../dgit:2162 +#, perl-format +msgid "" +"Found active distro-specific series file for %s (%s): %s, cannot continue" +msgstr "" +"Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " +"niet voortgaan" + +#: ../dgit:2193 +msgid "Dpkg::Vendor `current vendor'" +msgstr "Dpkg::Vendor `current vendor'" + +#: ../dgit:2195 +msgid "(base) distro being accessed" +msgstr "(basis)-distributie wordt benaderd" + +#: ../dgit:2197 +msgid "(nominal) distro being accessed" +msgstr "(nominale) distributie wordt benaderd" + +#: ../dgit:2218 ../dgit:2223 +#, perl-format +msgid "accessing %s: %s" +msgstr "bezig met benaderen van %s: %s" + +#: ../dgit:2238 ../dgit:2245 +#, perl-format +msgid "saving %s: %s" +msgstr "bezig met opslaan van %s: %s" + +#: ../dgit:2311 +#, perl-format +msgid "dgit (child): exec %s: %s" +msgstr "dgit (dochter): exec %s: %s" + +#: ../dgit:2375 ../dgit:5892 +msgid "source package" +msgstr "broncodepakket" + +#: ../dgit:2393 +msgid "package changelog" +msgstr "changelog van het pakket" + +#: ../dgit:2433 +msgid "package changelog has no entries!" +msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" + +#: ../dgit:2452 +#, perl-format +msgid "Import %s" +msgstr "Importeren van %s" + +#: ../dgit:2533 +#, perl-format +msgid "%s: trying slow absurd-git-apply..." +msgstr "%s: langzame absurd-git-apply wordt gebruikt..." + +#: ../dgit:2552 +#, perl-format +msgid "%s failed: %s\n" +msgstr "%s mislukte: %s\n" + +#: ../dgit:2561 +#, perl-format +msgid "" +"gbp-pq import and dpkg-source disagree!\n" +" gbp-pq import gave commit %s\n" +" gbp-pq import gave tree %s\n" +" dpkg-source --before-build gave tree %s\n" +msgstr "" +"gbp-pq import en dpkg-source zijn het oneens!\n" +" gbp-pq import gaf commit %s\n" +" gbp-pq import gaf boom %s\n" +" dpkg-source --before-build gaf boom %s\n" + +#: ../dgit:2576 +#, perl-format +msgid "synthesised git commit from .dsc %s" +msgstr "git commit samengesteld vanuit .dsc %s" + +#: ../dgit:2580 +msgid "Import of source package" +msgstr "Importeren van broncodepakket" + +#: ../dgit:2593 +#, perl-format +msgid "Record %s (%s) in archive suite %s\n" +msgstr "Gegeven %s (%s) uit archiefsuite %s\n" + +#: ../dgit:2597 +#, perl-format +msgid "" +"\n" +"Version actually in archive: %s (older)\n" +"Last version pushed with dgit: %s (newer or same)\n" +"%s\n" +msgstr "" +"\n" +"Momenteel in het archief aanwezige versie: %s (oudere)\n" +"Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" +"%s\n" + +#: ../dgit:2639 +#, perl-format +msgid "using existing %s" +msgstr "bestaande %s wordt gebruikt" + +#: ../dgit:2643 +#, perl-format +msgid "" +"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " +"file?)" +msgstr "" +"bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " +"bestand verwijderen?)" + +#: ../dgit:2647 +#, perl-format +msgid "need to fetch correct version of %s" +msgstr "moet de juiste versie van %s ophalen met fetch" + +#: ../dgit:2663 +#, perl-format +msgid "" +"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" +msgstr "" +"bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " +"bestand van het archief!)" + +#: ../dgit:2758 +msgid "too many iterations trying to get sane fetch!" +msgstr "te veel pogingen om een foutloze fetch te bekomen!" + +#: ../dgit:2773 +#, 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:2817 +#, 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:2832 +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 "" +"--dry-run werd opgegeven, maar we wilden eigenlijk het resultaat van\n" +"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:2837 +#, perl-format +msgid "" +"warning: git ls-remote suggests we want %s\n" +"warning: and it should refer to %s\n" +"warning: but git fetch didn't fetch that object to any relevant ref.\n" +"warning: This may be due to a race with someone updating the server.\n" +"warning: Will try again...\n" +msgstr "" +"waarschuwing: git ls-remote suggereert dat we %s wensen\n" +"waarschuwing: en dat het zou moeten verwijzen naar %s\n" +"waarschuwing: maar git fetch haalde dat object niet naar een relevante " +"ref.\n" +"waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" +"waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" + +#: ../dgit:2904 +#, perl-format +msgid "Not updating %s from %s to %s.\n" +msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" + +#: ../dgit:2953 +#, perl-format +msgid "%s: NO git hash" +msgstr "%s: GEEN hash van git" + +#: ../dgit:2957 +#, perl-format +msgid "%s: specified git info (%s)" +msgstr "%s: git info werd opgegeven (%s)" + +#: ../dgit:2964 +#, perl-format +msgid "%s: specified git hash" +msgstr "%s: git hash werd opgegeven" + +#: ../dgit:2966 +#, perl-format +msgid "%s: invalid Dgit info" +msgstr "%s: ongeldige Dgit info" + +#: ../dgit:2988 +#, 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:2993 +#, perl-format +msgid ".dsc names distro %s: fetching %s" +msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" + +#: ../dgit:2998 +#, 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 "" +"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:3008 +#, perl-format +msgid "" +".dsc Dgit metadata is in context of distro %s\n" +"for which we have no configured url;\n" +".dsc provides hinted url with protocol %s which is unsafe.\n" +"(can be overridden by config - consult documentation)\n" +msgstr "" +"De Dgit-metadata van .dsc zijn in de context van distributie %s\n" +"waarvoor we geen geconfigureerde url hebben;\n" +".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" +"(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" + +#: ../dgit:3028 +msgid "rewrite map" +msgstr "modificatieplan (rewrite map) " + +#: ../dgit:3035 +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:3039 +msgid "using rewritten git hash in place of .dsc value" +msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" + +#: ../dgit:3041 +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:3048 +msgid "additional commits" +msgstr "extra vastleggingen (commits)" + +#: ../dgit:3051 +#, perl-format +msgid "" +".dsc Dgit metadata requires commit %s\n" +"but we could not obtain that object anywhere.\n" +msgstr "" +"De Dgit-metadata uit .dsc vereist commit %s\n" +"maar we konden dat object nergens bekomen.\n" + +#: ../dgit:3075 +msgid "last upload to archive" +msgstr "laatste upload naar het archief" + +#: ../dgit:3079 +msgid "no version available from the archive" +msgstr "geen versie beschikbaar uit het archief" + +#: ../dgit:3162 +msgid "dgit suite branch on dgit git server" +msgstr "dgit suite-tak op dgit git-server" + +#: ../dgit:3169 +msgid "dgit client's archive history view" +msgstr "dgit - weergave geschiedenis van cliëntarchief" + +#: ../dgit:3174 +msgid "Dgit field in .dsc from archive" +msgstr "Dgit-veld in het .dsc uit het archief" + +#: ../dgit:3202 +#, perl-format +msgid "" +"\n" +"Git commit in archive is behind the last version allegedly pushed/uploaded.\n" +"Commit referred to by archive: %s\n" +"Last version pushed with dgit: %s\n" +"%s\n" +msgstr "" +"\n" +"De git commit in het archief loopt achter op de laatste versie die naar\n" +"verluidt gepusht/geüpload werd.\n" +"Commit waarnaar het archief verwijst: %s\n" +"Laatste versie die met dgit gepusht werd: %s\n" +"%s\n" + +#: ../dgit:3215 +msgid "archive .dsc names newer git commit" +msgstr ".dsc van het archief vermeldt een recentere git commit" + +#: ../dgit:3218 +msgid "archive .dsc names other git commit, fixing up" +msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" + +#: ../dgit:3239 +#, perl-format +msgid "" +"\n" +"Package not found in the archive, but has allegedly been pushed using dgit.\n" +"%s\n" +msgstr "" +"\n" +"Pakket niet gevonden in het archief, maar werd naar verluidt gepusht met " +"dgit.\n" +"%s\n" + +#: ../dgit:3248 +#, perl-format +msgid "" +"\n" +"Warning: relevant archive skew detected.\n" +"Archive allegedly contains %s\n" +"But we were not able to obtain any version from the archive or git.\n" +"\n" +msgstr "" +"\n" +"Waarschuwing: relevante archiefscheeftrekking vastgesteld.\n" +"Archief bevat naar verluidt %s\n" +"Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" +"\n" + +#: ../dgit:3333 +#, perl-format +msgid "" +"Record %s (%s) in archive suite %s\n" +"\n" +"Record that\n" +msgstr "" +"Gegeven %s (%s) uit de archief-suite %s\n" +"\n" +"Gegeven dat\n" + +#: ../dgit:3346 +msgid "should be treated as descended from\n" +msgstr "behandeld zou moeten worden als afstammend van\n" + +#: ../dgit:3364 +msgid "dgit repo server tip (last push)" +msgstr "tip van de dgit-opslagplaats op de server (laatste push)" + +#: ../dgit:3366 +msgid "local tracking tip (last fetch)" +msgstr "tip van de lokale kopie (laatste fetch)" + +#: ../dgit:3377 +#, perl-format +msgid "" +"\n" +"Warning: archive skew detected. Using the available version:\n" +"Archive allegedly contains %s\n" +"We were able to obtain only %s\n" +"\n" +msgstr "" +"\n" +"Waarschuwing: archiefscheeftrekking vastgesteld. Beschikbare versie wordt " +"gebruikt:\n" +"Archief bevat naar verluidt %s\n" +"We waren slechts in staat om %s te bekomen\n" +"\n" + +#: ../dgit:3392 +msgid "fetched source tree" +msgstr "broncodeboom opgehaald" + +#: ../dgit:3428 +msgid "debian/changelog merge driver" +msgstr "stuurprogramma voor samenvoeging van debian/changelog" + +#: ../dgit:3493 +msgid "" +"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" +" not doing further gitattributes setup\n" +msgstr "" +"[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" +" gitattributes wordt niet verder ingesteld\n" + +#: ../dgit:3507 +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:3522 +#, perl-format +msgid "install %s: %s" +msgstr "installeren van %s: %s" + +#: ../dgit:3549 +#, perl-format +msgid "" +"dgit: warning: %s contains .gitattributes\n" +"dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-" +"tree.\n" +msgstr "" +"dgit: waarschuwing: %s bevat .gitattributes\n" +"dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " +"setup-new-tree.\n" + +#: ../dgit:3571 +#, perl-format +msgid "fetching %s..." +msgstr "ophalen van %s..." + +#: ../dgit:3579 +#, perl-format +msgid "failed to obtain %s: %s" +msgstr "verkrijgen van %s mislukte: %s" + +#: ../dgit:3618 +#, perl-format +msgid "package %s missing in (base suite) %s" +msgstr "pakket %s ontbreekt in (basissuite) %s" + +#: ../dgit:3650 +msgid "local combined tracking branch" +msgstr "lokale gecombineerde navolgende tak (tracking branch)" + +#: ../dgit:3652 +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:3691 +#, perl-format +msgid "" +"Combine archive branches %s [dgit]\n" +"\n" +"Input branches:\n" +msgstr "" +"Archieftakken %s combineren [dgit]\n" +"\n" +"Invoertakken:\n" + +#: ../dgit:3705 +msgid "" +"\n" +"Key\n" +" * marks the highest version branch, which choose to use\n" +" + marks each branch which was not already an ancestor\n" +"\n" +msgstr "" +"\n" +"Legende\n" +" * markeert de tak met de hoogste versie, welke voor gebruik gekozen werd\n" +" + markeert elke tak die niet reeds een voorouder was\n" +"\n" + +#: ../dgit:3720 +#, perl-format +msgid "calculated combined tracking suite %s" +msgstr "berekende gecombineerde navolgende suite %s" + +#: ../dgit:3738 +#, perl-format +msgid "ready for work in %s" +msgstr "klaar om te werken in %s" + +#: ../dgit:3746 +msgid "dry run makes no sense with clone" +msgstr "dry run is zinloos met clone" + +#: ../dgit:3763 +#, perl-format +msgid "create `%s': %s" +msgstr "creëren van `%s': %s" + +#: ../dgit:3774 +msgid "fetching existing git history" +msgstr "ophalen van bestaande git-geschiedenis" + +#: ../dgit:3778 +msgid "starting new git history" +msgstr "starten van een nieuwe git-geschiedenis" + +#: ../dgit:3804 +#, 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 "" +"t.k.n.: Vcs-Git in %s bevat een andere url naar uw externe vcs-git.\n" +" De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " +"update-vcs-git gebruiken?\n" + +#: ../dgit:3809 +#, perl-format +msgid "fetched into %s" +msgstr "opgehaald naar %s" + +#: ../dgit:3821 +#, perl-format +msgid "Merge from %s [dgit]" +msgstr "Samenvoegen vanuit %s [dgit]" + +#: ../dgit:3823 +#, perl-format +msgid "fetched to %s and merged into HEAD" +msgstr "opgehaald naar %s samengevoegd naar HEAD" + +#: ../dgit:3831 +#, perl-format +msgid "git tree contains %s" +msgstr "git-boom bevat %s" + +#: ../dgit:3842 +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:3861 +#, perl-format +msgid "" +"quilt fixup required but quilt mode is `nofix'\n" +"HEAD commit%s differs from tree implied by debian/patches%s" +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:3878 +msgid "nothing quilty to commit, ok." +msgstr "niets quilt-achtig vast te leggen, oké." + +#: ../dgit:3881 +msgid " (wanted to commit patch update)" +msgstr " (wilde een patch-update vastleggen)" + +#: ../dgit:3885 +msgid "" +"Commit Debian 3.0 (quilt) metadata\n" +"\n" +msgstr "" +"Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" +"\n" + +#: ../dgit:3928 +#, perl-format +msgid "" +"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" +msgstr "" +"Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" +"quilt=nocheck" + +#: ../dgit:3933 +#, perl-format +msgid "Format `%s', need to check/update patch stack" +msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" + +#: ../dgit:3943 +#, perl-format +msgid "commit id %s" +msgstr "vastleggings-id (commit id) %s" + +#: ../dgit:3949 +#, perl-format +msgid "and left in %s" +msgstr "en achtergelaten in %s" + +#: ../dgit:3975 +#, 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:3978 +#, 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:3986 +#, 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:3995 +msgid "version currently in archive" +msgstr "momenteel in het archief aanwezige versie" + +#: ../dgit:4004 +#, perl-format +msgid "Checking package changelog for archive version %s ..." +msgstr "" +"Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " +"%s ..." + +#: ../dgit:4012 +#, perl-format +msgid "%s field from dpkg-parsechangelog %s" +msgstr "veld %s van dpkg-parsechangelog %s" + +#: ../dgit:4022 +#, perl-format +msgid "Perhaps debian/changelog does not mention %s ?" +msgstr "Vermeldt debian/changelog misschien %s niet?" + +#: ../dgit:4025 +#, perl-format +msgid "" +"%s is %s\n" +"Your tree seems to based on earlier (not uploaded) %s.\n" +msgstr "" +"%s is %s\n" +"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" + +#: ../dgit:4039 +#, perl-format +msgid "Declaring that HEAD includes all changes in %s..." +msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." + +#: ../dgit:4095 +msgid "Checking that HEAD includes all changes in archive..." +msgstr "" +"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." + +#: ../dgit:4104 +msgid "maintainer view tag" +msgstr "tag weergave pakketonderhouder" + +#: ../dgit:4106 +msgid "dgit view tag" +msgstr "tag weergave dgit" + +#: ../dgit:4107 +msgid "current archive contents" +msgstr "huidige inhoud van het archief" + +#: ../dgit:4120 +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:4130 +#, perl-format +msgid "Declare fast forward from %s\n" +msgstr "Lineair (fast forward) declareren vanuit %s\n" + +#: ../dgit:4131 +#, perl-format +msgid "Make fast forward from %s\n" +msgstr "Lineair (fast forward) maken vanuit %s\n" + +#: ../dgit:4135 +#, perl-format +msgid "Made pseudo-merge of %s into dgit view." +msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." + +#: ../dgit:4148 +#, perl-format +msgid "Declare fast forward from %s" +msgstr "Lineair (fast forward) declareren vanuit %s" + +#: ../dgit:4156 +#, perl-format +msgid "Make pseudo-merge of %s into your HEAD." +msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." + +#: ../dgit:4168 +#, perl-format +msgid "-p specified %s but changelog specified %s" +msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" + +#: ../dgit:4190 +#, 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:4251 +#, 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:4279 +#, perl-format +msgid "%s release %s for %s (%s) [dgit]\n" +msgstr "%s release %s voor %s (%s) [dgit]\n" + +#: ../dgit:4292 +#, perl-format +msgid "" +"%s release %s for %s (%s)\n" +"(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" +"%s release %s voor %s (%s)\n" +"(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" + +#: ../dgit:4344 +msgid "" +"Push failed, while checking state of the archive.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte tijdens het nagaan van de toestand van het archief.\n" +"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " +"probleem.\n" + +#: ../dgit:4353 +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:4358 +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte tijdens het voorbereiden van uw push.\n" +"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " +"probleem.\n" + +#: ../dgit:4381 +#, 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:4398 +#, perl-format +msgid "" +"Branch is managed by git-debrebase (%s\n" +"exists), but quilt mode (%s) implies a split view.\n" +"Pass the right --quilt option or adjust your git config.\n" +"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" +msgstr "" +"Tak wordt beheerd door git-debrebase (%s\n" +"bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n" +"Gebruik de juiste --quilt-optie of pas uw git config aan.\n" +"Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" + +#: ../dgit:4422 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" +"--quilt=%s maar geen gecachete dgit-weergave:\n" +" werd HEAD misschien gewijzigd sinds dgit build[-source]?" + +#: ../dgit:4453 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --overwrite[=VERSION].\n" +"To rewind history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" +"dgit push: HEAD is geen afstammeling van de versie van het archief.\n" +"Om de inhoud van het archief te overschrijven, geeft u de opdracht --" +"overwrite[=VERSIE].\n" +"Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " +"u --deliberately-not-fast-forward." + +#: ../dgit:4463 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "bezig na te gaan dat %s overeenkomt met HEAD" + +#: ../dgit:4497 ../dgit:4509 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "HEAD geeft een andere boom op aan %s:\n" + +#: ../dgit:4503 +#, 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 "" +"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:4513 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" +"Misschien vergat u te bouwen (build). Of er is misschien een probleem met\n" +" uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te " +"zien,\n" +" gebruikt u git diff %s %s\n" + +#: ../dgit:4524 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" +"kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " +"u dgit -C gebruiken" + +#: ../dgit:4546 +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:4550 +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:4554 +#, perl-format +msgid "" +"source-only upload, even though package is entirely NEW\n" +"(this is contrary to policy in %s)" +msgstr "" +"upload van uitsluitend broncode (source-only), hoewel pakket volledig NIEUW " +"is\n" +"(dit is in tegenspraak met de beleidsrichtlijnen in %s)" + +#: ../dgit:4561 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" + +#: ../dgit:4605 +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte tijdens het ondertekenen van de tag.\n" +"Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " +"probleem.\n" + +#: ../dgit:4618 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" +"Push mislukte *na* het ondertekenen van de tag.\n" +"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " +"gebruiken.\n" + +#: ../dgit:4635 +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 "" +"Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie de " +"meldingen hierboven.\n" +"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " +"gebruiken.\n" + +#: ../dgit:4652 +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" +"debsign by hand to sign the changes file (see the command dgit tried,\n" +"above), and then dput that changes file to complete the upload.\n" +"If you need to change the package, you must use a new version number.\n" +msgstr "" +"Push mislukte bij het verkrijgen van de ondertekening van .changes en .dsc.\n" +"Indien het louter een mislukte ondertekening betreft, kunt u opnieuw " +"proberen\n" +"door handmatig het changes-bestand te ondertekenen met debsign (zie " +"hierboven\n" +"welk commando dgit gebruikte) en vervolgens het changes-bestand te uploaden\n" +"met dput om zo de upload te vervolledigen.\n" +"Indien u het pakket moet aanpassen, moet u een nieuw versienummer " +"gebruiken.\n" + +#: ../dgit:4683 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "%s gepusht en geüpload" + +#: ../dgit:4695 +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:4706 +msgid "incorrect arguments to dgit clone" +msgstr "incorrecte argumenten voor dgit clone" + +#: ../dgit:4712 ../git-debrebase:1839 +#, perl-format +msgid "%s already exists" +msgstr "%s bestaat reeds" + +#: ../dgit:4726 +#, perl-format +msgid "remove %s: %s\n" +msgstr "verwijder %s: %s\n" + +#: ../dgit:4730 +#, perl-format +msgid "check whether to remove %s: %s\n" +msgstr "controleer of %s moet verwijderd worden: %s\n" + +#: ../dgit:4768 +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "incorrecte argumenten voor dgit fetch of dgit pull" + +#: ../dgit:4785 +#, 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:4794 +msgid "dgit checkout needs a suite argument" +msgstr "dgit checkout heeft een suite nodig als argument" + +#: ../dgit:4856 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "bezig met opzetten van vcs-git: %s\n" + +#: ../dgit:4859 +#, perl-format +msgid "vcs git already configured: %s\n" +msgstr "vcs git is reeds geconfigureerd: %s\n" + +#: ../dgit:4861 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "url van vcs-git wordt veranderd naar: %s\n" + +#: ../dgit:4866 +#, perl-format +msgid "fetching (%s)\n" +msgstr "bezig met ophalen (%s)\n" + +#: ../dgit:4881 +#, perl-format +msgid "incorrect arguments to dgit %s" +msgstr "incorrecte argumenten voor dgit %s" + +#: ../dgit:4892 +#, 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:4930 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" +"de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " +"de aanroepende computer zijn %s" + +#: ../dgit:5010 +#, perl-format +msgid "create %s: %s" +msgstr "maak %s aan: %s" + +#: ../dgit:5047 +#, perl-format +msgid "build host child failed: %s" +msgstr "dochterproces op de bouwcomputer faalde: %s" + +#: ../dgit:5050 +msgid "all done\n" +msgstr "alles klaar\n" + +#: ../dgit:5059 +#, perl-format +msgid "file %s (%s) twice" +msgstr "bestand %s (%s) tweemaal" + +#: ../dgit:5067 +msgid "bad param spec" +msgstr "slechte parameter-spec" + +#: ../dgit:5073 +msgid "bad previously spec" +msgstr "slechte vroegere spec" + +#: ../dgit:5092 +#, perl-format +msgid "" +"rpush negotiated protocol version %s which does not support quilt mode %s" +msgstr "" +"de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " +"%s niet ondersteunt" + +#: ../dgit:5137 +#, perl-format +msgid "buildinfo mismatch in field %s" +msgstr "buildinfo-incongruentie in veld %s" + +#: ../dgit:5140 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "buildinfo bevat ongeoorloofd veld %s" + +#: ../dgit:5181 +msgid "remote changes file" +msgstr "extern changes-bestand" + +#: ../dgit:5256 +msgid "not a plain file or symlink\n" +msgstr "geen echt bestand of symbolische koppeling\n" + +#: ../dgit:5262 +msgid "mode or type changed\n" +msgstr "modus of type gewijzigd\n" + +#: ../dgit:5263 +msgid "modified symlink\n" +msgstr "symbolische koppeling gewijzigd\n" + +#: ../dgit:5266 +msgid "deletion of symlink\n" +msgstr "verwijdering van symbolische koppeling\n" + +#: ../dgit:5270 +msgid "creation with non-default mode\n" +msgstr "creatie met een niet-standaard modus\n" + +#: ../dgit:5300 +msgid "dgit view: changes are required..." +msgstr "dgit-weergave: er zijn wijzigingen vereist..." + +#: ../dgit:5329 +#, perl-format +msgid "" +"\n" +"For full diff showing the problem(s), type:\n" +" %s\n" +msgstr "" +"\n" +"Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" +" %s\n" + +#: ../dgit:5336 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-unapplied git tree\n" +" but git tree differs from orig in upstream files." +msgstr "" +"--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n" +" (een git-boom zonder dat de patches toegepast worden)\n" +" maar de git-boom verschilt van orig in de toeleveraarsbestanden." + +#: ../dgit:5342 +msgid "" +"\n" +" ... debian/patches is missing; perhaps this is a patch queue branch?" +msgstr "" +"\n" +" ... debian/patches ontbreekt; is dit misschien een tak met een patch-" +"wachtrij?" + +#: ../dgit:5349 +#, 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 "" +"--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n" +" (een git-boom met toegepaste patches)\n" +" maar de git-boom verschilt van het resultaat van het toepassen van\n" +" debian/patches op de broncode van de toeleveraar.\n" + +#: ../dgit:5356 +msgid "dgit view: creating patches-applied version using gbp pq" +msgstr "" +"dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" + +#: ../dgit:5365 +#, perl-format +msgid "" +"--quilt=%s specified, implying that HEAD is for use with a\n" +" tool which does not create patches for changes to upstream\n" +" .gitignores: but, such patches exist in debian/patches.\n" +msgstr "" +"--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om gebruikt\n" +" 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:5374 +msgid "dgit view: creating patch to represent .gitignore changes" +msgstr "" +"dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " +"representeren" + +#: ../dgit:5379 +#, 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:5384 +msgid "" +"Subject: Update .gitignore from Debian packaging branch\n" +"\n" +"The Debian packaging git branch contains these updates to the upstream\n" +".gitignore file(s). This patch is autogenerated, to provide these\n" +"updates to users of the official Debian archive view of the package.\n" +msgstr "" +"Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n" +"\n" +"De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n" +".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n" +"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:5406 +msgid "Commit patch to update .gitignore\n" +msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" + +#: ../dgit:5420 +msgid "converted" +msgstr "omgezet" + +#: ../dgit:5421 +#, perl-format +msgid "dgit view: created (%s)" +msgstr "dgit-weergave: gecreëerd: (%s)" + +#: ../dgit:5486 +msgid "maximum search space exceeded" +msgstr "maximale zoekruimte overschreden" + +#: ../dgit:5504 +#, perl-format +msgid "has %s not %s" +msgstr "bevat %s, niet %s" + +#: ../dgit:5513 +msgid "root commit" +msgstr "beginvastlegging (root commit)" + +#: ../dgit:5519 +#, perl-format +msgid "merge (%s nontrivial parents)" +msgstr "samenvoeging (merge) (%s niet-triviale ouders)" + +#: ../dgit:5531 +#, perl-format +msgid "changed %s" +msgstr "gewijzigd: %s" + +#: ../dgit:5550 +#, perl-format +msgid "" +"\n" +"%s: error: quilt fixup cannot be linear. Stopped at:\n" +msgstr "" +"\n" +"%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" + +#: ../dgit:5557 +#, perl-format +msgid "%s: %s: %s\n" +msgstr "%s: %s: %s\n" + +#: ../dgit:5569 +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:5572 +msgid "quilt fixup cannot be linear, smashing..." +msgstr "" +"de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." + +#: ../dgit:5584 +#, perl-format +msgid "" +"Automatically generated patch (%s)\n" +"Last (up to) %s git changes, FYI:\n" +"\n" +msgstr "" +"Automatisch gegenereerde patch (%s)\n" +"Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" +"\n" + +#: ../dgit:5591 +msgid "quiltify linearisation planning successful, executing..." +msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." + +#: ../dgit:5625 +msgid "contains unexpected slashes\n" +msgstr "bevat onverwachte slashes\n" + +#: ../dgit:5626 +msgid "contains leading punctuation\n" +msgstr "bevat leestekens aan het begin\n" + +#: ../dgit:5627 +msgid "contains bad character(s)\n" +msgstr "bevat foutieve teken(s)\n" + +#: ../dgit:5628 +msgid "is series file\n" +msgstr "is een series-bestand\n" + +#: ../dgit:5629 +msgid "too long\n" +msgstr "te lang\n" + +#: ../dgit:5633 +#, 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:5662 +#, perl-format +msgid "dgit: patch title transliteration error: %s" +msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" + +#: ../dgit:5802 +msgid "Commit removal of .pc (quilt series tracking data)\n" +msgstr "" +"Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" + +#: ../dgit:5812 +msgid "starting quiltify (single-debian-patch)" +msgstr "quiltify wordt gestart (één enkele debian-patch)" + +#: ../dgit:5914 +#, 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:5945 +#, perl-format +msgid "dgit view: found cached (%s)" +msgstr "dgit-weergave: gecachete (%s) aangetroffen" + +#: ../dgit:5950 +msgid "dgit view: found cached, no changes required" +msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" + +#: ../dgit:5961 +#, perl-format +msgid "examining quilt state (multiple patches, %s mode)" +msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" + +#: ../dgit:6052 +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" +" are probably too inconsistent. dgit can only fix up certain kinds of\n" +" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" +msgstr "" +"toepassen van de patch-stapel (uit debian/patches/) van uw git-boom op het/" +"de\n" +" overeenkomstig(e) tararchie(f)(ven) van de toeleveraar mislukte.\n" +" Uw broncodeboom en .orig zijn wellicht te inconsistent.\n" +" dgit can enkel bepaalde soorten anomalieën repareren\n" +" (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" + +#: ../dgit:6066 +msgid "Tree already contains .pc - will use it then delete it." +msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." + +#: ../dgit:6103 +#, 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:6106 +#, 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 "" +"%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:6112 +#, perl-format +msgid "dgit: cannot represent change: %s: %s\n" +msgstr "dgit: kan wijziging niet representeren: %s: %s\n" + +#: ../dgit:6116 +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:6123 +msgid "This might be a patches-unapplied branch." +msgstr "Dit is mogelijk een tak zonder toepassing van patches." + +#: ../dgit:6126 +msgid "This might be a patches-applied branch." +msgstr "Dit is mogelijk een tak met toegepaste patches." + +#: ../dgit:6129 +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:6132 +msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." +msgstr "" +"Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." + +#: ../dgit:6136 +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:6145 +#, perl-format +msgid "starting quiltify (multiple patches, %s mode)" +msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" + +#: ../dgit:6183 +msgid "" +"\n" +"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" +"dgit: Have to apply the patches - making the tree dirty.\n" +"dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)\n" +"\n" +msgstr "" +"\n" +"dgit: Bezig met bouwen of opruimen met het target rules\n" +" in de tak patches-niet-toepassen.\n" +"dgit: Moet de patches toepassen - hetgeen de boom vervuilt.\n" +"dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" +"\n" + +#: ../dgit:6195 +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:6223 +#, perl-format +msgid "" +"%s\n" +"If this is just missing .gitignore entries, use a different clean\n" +"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +"or --clean=git (-wg/-wgf) to use `git clean' instead.\n" +msgstr "" +"%s\n" +"Indien het enkel ontbrekende .gitignore-items betreft, gebruik dan een " +"andere\n" +"clean-modus, bijv. --clean=dpkg-source,no-check (-wdu/-wddu) om deze te\n" +"negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " +"gebruiken.\n" + +#: ../dgit:6237 +msgid "tree contains uncommitted files and --clean=check specified" +msgstr "" +"de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" + +#: ../dgit:6240 +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:6261 +msgid "tree contains uncommitted files (after running rules clean)" +msgstr "" +"de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" + +#: ../dgit:6275 +msgid "clean takes no additional arguments" +msgstr "met clean kunnen geen extra argumenten opgegeven worden" + +#: ../dgit:6288 +#, perl-format +msgid "-p is not allowed with dgit %s" +msgstr "-p is niet toegestaan met dgit %s" + +#: ../dgit:6324 +#, perl-format +msgid "remove old changes file %s: %s" +msgstr "verwijder oud changes-bestand %s: %s" + +#: ../dgit:6326 +#, perl-format +msgid "would remove %s" +msgstr "zou %s verwijderen" + +#: ../dgit:6352 +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:6358 +#, perl-format +msgid "changelog will contain changes since %s" +msgstr "changelog zal wijzigingen sinds %s bevatten" + +#: ../dgit:6361 +msgid "package seems new, not specifying -v" +msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" + +#: ../dgit:6404 +msgid "Wanted to build nothing!" +msgstr "Wilde niets bouwen!" + +#: ../dgit:6442 +#, perl-format +msgid "only one changes file from build (%s)\n" +msgstr "slechts één changes-bestand van bouw (%s)\n" + +#: ../dgit:6449 +#, perl-format +msgid "%s found in binaries changes file %s" +msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" + +#: ../dgit:6456 +#, perl-format +msgid "%s unexpectedly not created by build" +msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" + +#: ../dgit:6460 +#, perl-format +msgid "install new changes %s{,.inmulti}: %s" +msgstr "installeer nieuw changes %s{,.inmulti}: %s" + +#: ../dgit:6465 +#, perl-format +msgid "wrong number of different changes files (%s)" +msgstr "fout nummer van verschillende changes-bestanden (%s)" + +#: ../dgit:6468 +#, perl-format +msgid "build successful, results in %s\n" +msgstr "bouw was succesvol, resultaten in %s\n" + +#: ../dgit:6481 +#, perl-format +msgid "" +"changes files other than source matching %s already present; building would " +"result in ambiguity about the intended results.\n" +"Suggest you delete %s.\n" +msgstr "" +"er zijn reeds andere changes-bestanden aanwezig dan met %s overeenkomende " +"broncode,; bouwen zou resulteren in ambiguïteit over het bedoelde " +"resultaat.\n" +"De suggestie is dat u %s verwijdert.\n" + +#: ../dgit:6499 +msgid "build successful\n" +msgstr "de bouw was succesvol\n" + +#: ../dgit:6506 +#, 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 "" +"%s: waarschuwing: build-products-dir ingesteld, maar niet ondersteund door " +"dpkg-buildpackage\n" +"%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " +"gaan naar ..\n" + +#: ../dgit:6616 +#, perl-format +msgid "remove %s: %s" +msgstr "verwijder %s: %s" + +#: ../dgit:6651 +msgid "--include-dirty not supported with --build-products-dir, sorry" +msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" + +#: ../dgit:6671 +#, perl-format +msgid "put in place new built file (%s): %s" +msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" + +#: ../dgit:6684 +msgid "build-source takes no additional arguments" +msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" + +#: ../dgit:6688 +#, perl-format +msgid "source built, results in %s and %s" +msgstr "broncodepakket is gebouwd, resultaten in %s en %s" + +#: ../dgit:6695 +msgid "" +"dgit push-source: --include-dirty/--ignore-dirty does not makesense with " +"push-source!" +msgstr "" +"dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" +"source!" + +#: ../dgit:6701 +msgid "source changes file" +msgstr "broncode-changes-bestand" + +#: ../dgit:6703 +msgid "user-specified changes file is not source-only" +msgstr "" +"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" + +#: ../dgit:6723 ../dgit:6725 +#, perl-format +msgid "%s (in build products dir): %s" +msgstr "%s (in bouwproductenmap): %s" + +#: ../dgit:6738 +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 "" +"moet u misschien -A opgeven? (sbuild's standaard is om enkel arch-" +"specifieke\n" +"binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" + +#: ../dgit:6750 +msgid "" +"you asked for a builder but your debbuildopts didn't ask for any binaries -- " +"is this really what you meant?" +msgstr "" +"u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " +"pakket - is dit echt wat u bedoelde?" + +#: ../dgit:6754 +msgid "" +"we must build a .dsc to pass to the builder but your debbuiltopts forbids " +"the building of a source package; cannot continue" +msgstr "" +"we moeten een .dsc bouwen om door te geven aan het bouwprogramma, maar uw " +"debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " +"onmogelijk" + +#: ../dgit:6784 +msgid "incorrect arguments to dgit print-unapplied-treeish" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:6806 +msgid "source tree" +msgstr "broncodeboom" + +#: ../dgit:6808 +#, perl-format +msgid "dgit: import-dsc: %s" +msgstr "dgit: import-dsc: %s" + +#: ../dgit:6821 +#, perl-format +msgid "unknown dgit import-dsc sub-option `%s'" +msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" + +#: ../dgit:6825 +msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" +msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" + +#: ../dgit:6829 +msgid "dry run makes no sense with import-dsc" +msgstr "testuitvoering (dry run) is zinloos met import-dsc" + +#: ../dgit:6846 +#, perl-format +msgid "%s is checked out - will not update it" +msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" + +#: ../dgit:6851 +#, perl-format +msgid "open import .dsc (%s): %s" +msgstr "open import-.dsc (%s): %s" + +#: ../dgit:6853 +#, perl-format +msgid "read %s: %s" +msgstr "lees %s: %s" + +#: ../dgit:6864 +msgid "import-dsc signature check failed" +msgstr "controle ondertekening van import-dsc mislukte" + +#: ../dgit:6867 +#, perl-format +msgid "%s: warning: importing unsigned .dsc\n" +msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" + +#: ../dgit:6878 +msgid "Dgit metadata in .dsc" +msgstr "Dgit-metadata in .dsc" + +#: ../dgit:6889 +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:6898 +#, perl-format +msgid "" +".dsc contains Dgit field referring to object %s\n" +"Your git tree does not have that object. Try `git fetch' from a\n" +"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" +msgstr "" +".dsc bevat Dgit-veld dat verwijst naar object %s\n" +"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:6905 +msgid "Not fast forward, forced update." +msgstr "Niet lineair (fast forward), gedwongen update." + +#: ../dgit:6907 +#, perl-format +msgid "Not fast forward to %s" +msgstr "Niet lineair (fast forward) naar %s" + +#: ../dgit:6912 +#, perl-format +msgid "updated git ref %s" +msgstr "git ref %s geüpdatet" + +#: ../dgit:6917 +#, perl-format +msgid "" +"Branch %s already exists\n" +"Specify ..%s for a pseudo-merge, binding in existing history\n" +"Specify +%s to overwrite, discarding existing history\n" +msgstr "" +"Tak %s bestaat reeds\n" +"Geef ..%s op voor een pseudo-samenvoeging, ingepast in bestaande " +"geschiedenis\n" +"Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" + +#: ../dgit:6929 +#, perl-format +msgid "lstat %s works but stat gives %s !" +msgstr "lstat %s werkt maar stat geeft %s !" + +#: ../dgit:6931 +#, perl-format +msgid "stat %s: %s" +msgstr "stat %s: %s" + +#: ../dgit:6939 +#, 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:6943 +#, perl-format +msgid "import %s requires .../%s, but it does not exist" +msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" + +#: ../dgit:6948 +#, perl-format +msgid "import %s requires %s, but: %s" +msgstr "importeren van %s vereist %s, maar: %s" + +#: ../dgit:6950 +#, perl-format +msgid "symlink %s to %s: %s" +msgstr "symbolische koppeling %s naar %s: %s" + +#: ../dgit:6951 +#, perl-format +msgid "made symlink %s -> %s" +msgstr "maakte symbolische koppeling %s -> %s" + +#: ../dgit:6962 +msgid "Import, forced update - synthetic orphan git history." +msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." + +#: ../dgit:6964 +msgid "Import, merging." +msgstr "Import, bezig met samenvoegen." + +#: ../dgit:6978 +#, perl-format +msgid "Merge %s (%s) import into %s\n" +msgstr "Invoegen van import %s (%s) in %s\n" + +#: ../dgit:6987 +#, perl-format +msgid "results are in git ref %s" +msgstr "resultaten staan in git ref %s" + +#: ../dgit:6994 +msgid "need only 1 subpath argument" +msgstr "slechts 1 argument met een onderliggend pad nodig" + +#: ../dgit:7000 +#, perl-format +msgid "exec curl: %s\n" +msgstr "exec curl: %s\n" + +#: ../dgit:7014 +msgid "need destination argument" +msgstr "bestemmingsargument nodig" + +#: ../dgit:7019 +#, perl-format +msgid "exec git clone: %s\n" +msgstr "exec git clone: %s\n" + +#: ../dgit:7027 +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:7038 +msgid "no arguments allowed to dgit print-dpkg-source-ignores" +msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" + +#: ../dgit:7044 +msgid "no arguments allowed to dgit setup-mergechangelogs" +msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" + +#: ../dgit:7051 ../dgit:7057 +msgid "no arguments allowed to dgit setup-useremail" +msgstr "geen argumenten toegelaten bij dgit setup-useremail" + +#: ../dgit:7063 +msgid "no arguments allowed to dgit setup-tree" +msgstr "geen argumenten toegelaten bij dgit setup-tree" + +#: ../dgit:7110 +msgid "" +"--initiator-tempdir must be used specify an absolute, not relative, " +"directory." +msgstr "" +"--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " +"op te geven." + +#: ../dgit:7149 +#, perl-format +msgid "%s needs a value" +msgstr "%s moet een waarde hebben" + +#: ../dgit:7153 +#, perl-format +msgid "bad value `%s' for %s" +msgstr "foute waarde `%s' voor %s" + +#: ../dgit:7238 +#, perl-format +msgid "%s: warning: ignoring unknown force option %s\n" +msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" + +#: ../dgit:7258 +#, perl-format +msgid "unknown long option `%s'" +msgstr "onbekende lange optie `%s'" + +#: ../dgit:7314 +#, perl-format +msgid "unknown short option `%s'" +msgstr "onbekende korte optie `%s'" + +#: ../dgit:7329 +#, 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:7333 +#, perl-format +msgid "%s is blocked\n" +msgstr "%s is geblokkeerd\n" + +#: ../dgit:7339 +#, perl-format +msgid "" +"On entry to dgit, %s\n" +"This is a bug produced by something in your execution environment.\n" +"Giving up.\n" +msgstr "" +"Bij het binnengaan in dgit, %s\n" +"Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" +"Er wordt opgegeven.\n" + +#: ../dgit:7356 +#, perl-format +msgid "cannot set command for %s" +msgstr "kan commando voor %s niet instellen" + +#: ../dgit:7369 +#, perl-format +msgid "cannot configure options for %s" +msgstr "kan opties voor %s niet configureren" + +#: ../dgit:7389 +#, perl-format +msgid "unknown quilt-mode `%s'" +msgstr "onbekende quilt-modus `%s'" + +#: ../dgit:7399 +#, perl-format +msgid "unknown %s setting `%s'" +msgstr "onbekende %s dat `%s' instelt" + +#: ../dgit:7404 +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:7415 +#, perl-format +msgid "unknown clean-mode `%s'" +msgstr "onbekende clean-modus `%s'" + +#: ../dgit:7436 +msgid "DRY RUN ONLY\n" +msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" + +#: ../dgit:7437 +msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" +msgstr "" +"GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " +"WIJZIGINGEN MAKEN\n" + +#: ../dgit:7456 +#, perl-format +msgid "unknown operation %s" +msgstr "onbekende bewerking %s" + +#: ../git-debrebase:44 +msgid "" +"usages:\n" +" git-debrebase [] [--|-i ]\n" +" git-debrebase [] status\n" +" git-debrebase [] prepush [--prose=...]\n" +" git-debrebase [] quick|conclude\n" +" git-debrebase [] new-upstream [
]\n" +" git-debrebase [] convert-from-gbp []\n" +" ...\n" +"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" +msgstr "" +"gebruik:\n" +" git-debrebase [] [--|-i ]\n" +" git-debrebase [] status\n" +" git-debrebase [] prepush [--prose=...]\n" +" git-debrebase [] quick|conclude\n" +" git-debrebase [] new-upstream [
]\n" +" git-debrebase [] convert-from-gbp []\n" +" ...\n" +"Zie git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" + +#: ../git-debrebase:67 +#, perl-format +msgid "%s: bad usage: %s\n" +msgstr "%s: foutief gebruik: %s\n" + +#: ../git-debrebase:78 +#, perl-format +msgid "bad options follow `git-debrebase %s'" +msgstr "foutieve opties volgen na `git-debrebase %s'" + +#: ../git-debrebase:89 +#, perl-format +msgid "missing required git config %s" +msgstr "de vereiste git-configuratie %s ontbreekt" + +#: ../git-debrebase:401 +#, perl-format +msgid "%s: snag ignored (-f%s): %s\n" +msgstr "%s: moeilijkheid (snag) genegeerd (-f%s): %s\n" + +#: ../git-debrebase:404 +#, perl-format +msgid "%s: snag detected (-f%s): %s\n" +msgstr "%s: moeilijkheid (snag) gevonden (-f%s): %s\n" + +#: ../git-debrebase:417 +#, perl-format +msgid "%s: snags: %d overriden by individual -f options\n" +msgstr "" +"%s: moeilijkheden (snags): %d overschreven door individuele -f opties\n" + +#: ../git-debrebase:423 +#, perl-format +msgid "%s: snags: %d overriden by global --force\n" +msgstr "%s: moeilijkheden (snags): %d overschreven door het globale --force\n" + +#: ../git-debrebase:427 +#, perl-format +msgid "%s: snags: %d blocker(s) (you could -f, or --force)" +msgstr "" +"%s: moeilijkheden (snags): %d blokker(s) (u zou -f of --force kunnen " +"gebruiken)" + +#: ../git-debrebase:459 +msgid "" +"Branch/history seems mangled - no longer in gdr format.\n" +"See ILLEGAL OPERATIONS in git-debrebase(5).\n" +msgstr "" +"Tak/geschiedenis lijkt verknoeid - niet langer in gdr-indeling.\n" +"Zie ILLEGAL OPERATIONS (ongeldige bewerkingen) in git-debrebase(5).\n" + +#: ../git-debrebase:466 +#, perl-format +msgid "" +"%s\n" +"Is this meant to be a gdr branch? %s\n" +msgstr "" +"%s\n" +"Zou dit een gdr-tak moeten zijn? %s\n" + +#: ../git-debrebase:471 +#, perl-format +msgid "" +"%s\n" +"%s\n" +"Consider git-debrebase scrap, to throw away your recent work.\n" +msgstr "" +"%s\n" +"%s\n" +"Overweeg git-debrebase scrap, om uw recent werk weg te gooien.\n" + +#: ../git-debrebase:477 +#, perl-format +msgid "" +"%s\n" +"Branch does not seem to be meant to be a git-debrebase branch?\n" +"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n" +msgstr "" +"%s\n" +"Tak lijkt niet bedoeld te zijn als git-debrebase tak?\n" +"Foute tak, of misschien had u git-debrebase convert-from-* nodig.\n" + +#: ../git-debrebase:488 +#, perl-format +msgid "" +"%s\n" +"Branch/history mangled, and diverged since last git-debrebase.\n" +"Maybe you reset to, or rebased from, somewhere inappropriate.\n" +msgstr "" +"%s\n" +"Tak/geschiedenis verknoeid en uiteengelopen sinds laatste git-debrebase.\n" +"Misschien voerde u een reset naar of een rebase van een ongepaste plaats " +"uit.\n" + +#: ../git-debrebase:935 +#, perl-format +msgid "git-debrebase `anchor' but %s" +msgstr "git-debrebase `anker' maar %s" + +#: ../git-debrebase:937 +msgid "has other than two parents" +msgstr "heeft iets anders dan twee ouders" + +#: ../git-debrebase:938 +msgid "contains debian/patches" +msgstr "bevat debian/patches" + +#: ../git-debrebase:964 +msgid "is an origin commit" +msgstr "is een externe vastlegging (origin commit)" + +#: ../git-debrebase:966 +msgid "upstream files differ from left parent" +msgstr "bestanden van de toeleveraar verschillen van de linkerouder" + +#: ../git-debrebase:968 +msgid "debian/ differs from right parent" +msgstr "debian/ verschilt van de rechterouder" + +#: ../git-debrebase:979 +msgid "edits debian/patches" +msgstr "bewerkt debian/patches" + +#: ../git-debrebase:991 +msgid "parent's debian is not a directory" +msgstr "bij de ouder is debian geen map" + +#: ../git-debrebase:998 +msgid "no changes" +msgstr "geen wijzigingen" + +#: ../git-debrebase:1004 +msgid "origin commit" +msgstr "externe vastlegging (origin commit)" + +#: ../git-debrebase:1055 +#, perl-format +msgid "unknown kind of merge from %s" +msgstr "onbekend soort samenvoeging vanuit %s" + +#: ../git-debrebase:1058 +msgid "octopus merge" +msgstr "meervoudige samenvoeging (octopus merge)" + +#: ../git-debrebase:1062 +msgid "general two-parent merge" +msgstr "algemene twee-oudersamenvoeging (two-parent merge)" + +#: ../git-debrebase:1079 +#, perl-format +msgid "inconsistent anchors in merged-breakwaters %s" +msgstr "strijdige ankers in samengevoegde golfbrekers (merged-breakwaters) %s" + +#: ../git-debrebase:1119 +#, perl-format +msgid "branch needs laundering (run git-debrebase): %s" +msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s" + +#: ../git-debrebase:1147 +#, perl-format +msgid "packaging change (%s) follows upstream change" +msgstr "wijziging (%s) bij het verpakken volgt de wijziging van de toeleveraar" + +#: ../git-debrebase:1148 +#, perl-format +msgid " (eg %s)" +msgstr " (bijv. %s)" + +#: ../git-debrebase:1154 +msgid "found mixed upstream/packaging commit" +msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen" + +#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168 +#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187 +#, perl-format +msgid " (%s)" +msgstr " (%s)" + +#: ../git-debrebase:1162 +#, perl-format +msgid "found interchange bureaucracy commit (%s)" +msgstr "vastlegging in verband met uitwisselingsbeheer aangetroffen (%s)" + +#: ../git-debrebase:1167 +msgid "found dgit dsc import" +msgstr "dsc-import door dgit aangetroffen" + +#: ../git-debrebase:1172 +msgid "found bare dgit dsc import with no prior history" +msgstr "" +"kale dsc-import door dgit aangetroffen zonder voorafgaande geschiedenis" + +#: ../git-debrebase:1178 +msgid "found vanilla merge" +msgstr "standaardsamenvoeging (vanilla merge) aangetroffen" + +#: ../git-debrebase:1185 +#, perl-format +msgid "found unprocessable commit, cannot cope: %s" +msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s" + +#: ../git-debrebase:1253 +#, perl-format +msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" +msgstr "" +"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om; %3$s: " +"(vastlegging %1$s) (d.%2$s)" + +#: ../git-debrebase:1254 +#, perl-format +msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" +msgstr "" +"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: (vastlegging " +"%1$s) (d.%2$s)" + +#: ../git-debrebase:1375 +msgid "bare dgit dsc import" +msgstr "kale dsc-import door dgit" + +#: ../git-debrebase:1715 ../git-debrebase:1718 +#, perl-format +msgid "mismatch %s ?" +msgstr "discrepantie %s ?" + +#: ../git-debrebase:1721 +#, perl-format +msgid "mismatch %s != %s ?" +msgstr "discrepantie %s != %s ?" + +#: ../git-debrebase:1731 +#, perl-format +msgid "internal error %#x %s %s" +msgstr "interne fout %#x %s %s" + +#: ../git-debrebase:1759 +#, perl-format +msgid "%s: laundered (head was %s)\n" +msgstr "%s: gewassen (laundered) (head was %s)\n" + +#: ../git-debrebase:1773 +msgid "you are in the middle of a git-rebase already" +msgstr "u bent reeds middenin een git-rebase" + +#: ../git-debrebase:1799 +msgid "launder for rebase" +msgstr "wassen (launder) voor rebase" + +#: ../git-debrebase:1804 +msgid "analyse does not support any options" +msgstr "analyse ondersteunt geen opties" + +#: ../git-debrebase:1806 +msgid "too many arguments to analyse" +msgstr "te veel argumenten om te analyseren" + +#: ../git-debrebase:1841 +msgid "HEAD symref is not to refs/heads/" +msgstr "HEAD symref wijst niet naar refs/heads/" + +#: ../git-debrebase:1864 +#, perl-format +msgid "OK, you are ahead of %s\n" +msgstr "Oké, u bent voor op %s\n" + +#: ../git-debrebase:1868 +#, perl-format +msgid "you are behind %s, divergence risk" +msgstr "u bent achter op %s, gevaar voor uiteenlopen" + +#: ../git-debrebase:1872 +#, perl-format +msgid "you have diverged from %s" +msgstr "u bent uiteengelopen van %s" + +#: ../git-debrebase:1894 +msgid "remote dgit branch" +msgstr "externe dgit-tak" + +#: ../git-debrebase:1897 +msgid "remote dgit branch for sid" +msgstr "externe dgit-tak voor sid" + +#: ../git-debrebase:1925 +msgid "Recorded previous head for preservation" +msgstr "Vorige head voor behoud opgetekend" + +#: ../git-debrebase:1933 +#, perl-format +msgid "could not record ffq-prev: %s" +msgstr "kon ffq-prev niet optekenen: %s" + +#: ../git-debrebase:1944 +#, perl-format +msgid "could not check ffq-prev: %s" +msgstr "kon ffq-prev niet controleren: %s" + +#: ../git-debrebase:1964 +msgid "fast forward" +msgstr "lineair (fast forward)" + +#: ../git-debrebase:1974 +msgid "Declare fast forward / record previous work" +msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" + +#: ../git-debrebase:1986 +msgid "No ffq-prev to stitch." +msgstr "Geen ffq-prev om te borduren." + +#: ../git-debrebase:2016 +#, perl-format +msgid "" +"Could not determine appropriate upstream commitish.\n" +" (Tried these tags: %s)\n" +" Check version, and specify upstream commitish explicitly." +msgstr "" +"Kon geen passende toeleveraar-commitish bepalen.\n" +" (Probeerde deze tags: %s)\n" +" Controleer versie en geef toeleveraar-commitish expliciet op." + +#: ../git-debrebase:2033 +msgid "need NEW-VERSION [UPS-COMMITTISH]" +msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" + +#: ../git-debrebase:2038 +#, perl-format +msgid "bad version number `%s'" +msgstr "fout versienummer `%s'" + +#: ../git-debrebase:2055 +#, perl-format +msgid "upstream piece `%s'" +msgstr "toeleveraarsstuk `%s'" + +#: ../git-debrebase:2056 +msgid "upstream (main piece" +msgstr "van de toeleveraar (belangrijkste stuk" + +#: ../git-debrebase:2076 +msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" +msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" + +#: ../git-debrebase:2094 +msgid "old anchor is recognised due to --anchor, cannot check upstream" +msgstr "" +"oud anker werd herkend omwille van --anchor, kan niet controleren bij " +"toeleveraar" + +#: ../git-debrebase:2110 +#, perl-format +msgid "" +"previous upstream combine %s mentions %d pieces (each implying one parent) " +"but has %d parents (one per piece plus maybe a previous combine)" +msgstr "" +"vorige toeleveraarscombinatie (upstream combine) %s vermeldt %d stukken " +"(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " +"stuk plus misschien een eerdere combinatie)" + +#: ../git-debrebase:2119 +#, perl-format +msgid "previous upstream combine %s first piece is not `.'" +msgstr "" +"eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet " +"`.'" + +#: ../git-debrebase:2132 +#, perl-format +msgid "" +"previous upstream %s is from git-debrebase but not an `upstream-combine' " +"commit" +msgstr "" +"vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-" +"combine'-vastlegging" + +#: ../git-debrebase:2143 +#, perl-format +msgid "introducing upstream piece `%s'" +msgstr "toeleveraarsstuk `%s' wordt ingevoerd" + +#: ../git-debrebase:2146 +#, perl-format +msgid "dropping upstream piece `%s'" +msgstr "toeleveraarsstuk `%s' wordt weggelaten" + +#: ../git-debrebase:2149 +#, perl-format +msgid "not fast forward: %s %s" +msgstr "niet lineair (fast forward): %s %s" + +#: ../git-debrebase:2260 +msgid "Previous head already recorded\n" +msgstr "Vorige head reeds opgenomen\n" + +#: ../git-debrebase:2264 +#, perl-format +msgid "Could not preserve: %s" +msgstr "Niet in staat te behouden: %s" + +#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 +#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 +#: ../git-debrebase:2468 +msgid "no arguments allowed" +msgstr "geen argumenten toegelaten" + +#: ../git-debrebase:2303 +msgid "branch contains furniture (not laundered)" +msgstr "tak bevat stoffering (niet gewassen)" + +#: ../git-debrebase:2304 +msgid "branch is unlaundered" +msgstr "tak is ongewassen (unlaundered)" + +#: ../git-debrebase:2305 +msgid "branch needs laundering" +msgstr "tak heeft wasbeurt nodig" + +#: ../git-debrebase:2306 +msgid "branch not in git-debrebase form" +msgstr "tak is niet in git-debrebase-indeling" + +#: ../git-debrebase:2316 +msgid "current branch contents, in git-debrebase terms:\n" +msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" + +#: ../git-debrebase:2318 +msgid " branch is laundered\n" +msgstr " tak is gewassen\n" + +#: ../git-debrebase:2334 +#, perl-format +msgid " %s is not well-defined\n" +msgstr " %s is niet goed gedefinieerd\n" + +#: ../git-debrebase:2340 +msgid "key git-debrebase commits:\n" +msgstr "kern-git-debrebase-vastleggingen:\n" + +#: ../git-debrebase:2341 +msgid "anchor" +msgstr "anker" + +#: ../git-debrebase:2342 +msgid "breakwater" +msgstr "golfbreker (breakwater)" + +#: ../git-debrebase:2347 +msgid "branch and ref status, in git-debrebase terms:\n" +msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" + +#: ../git-debrebase:2354 +msgid " unstitched; previous tip was:\n" +msgstr " borduursel losgemaakt; vorige tip was:\n" + +#: ../git-debrebase:2357 +msgid " stitched? (no record of git-debrebase work)\n" +msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" + +#: ../git-debrebase:2359 +msgid " stitched\n" +msgstr " geborduurd\n" + +#: ../git-debrebase:2361 +msgid " not git-debrebase (diverged since last stitch)\n" +msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" + +#: ../git-debrebase:2364 +msgid "you are currently rebasing\n" +msgstr "u bent momenteel aan het rebasen\n" + +#: ../git-debrebase:2381 ../git-debrebase:2394 +msgid "launder for git-debrebase quick" +msgstr "wassen voor git-debrebase quick" + +#: ../git-debrebase:2388 ../git-debrebase:2418 +msgid "No ongoing git-debrebase session." +msgstr "Geen lopende git-debrebase-sessie." + +#: ../git-debrebase:2457 +msgid "Commit patch queue (exported by git-debrebase)" +msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" + +#: ../git-debrebase:2474 +msgid "No (more) patches to export." +msgstr "Geen (andere) patches die geëxporteerd moeten worden." + +#: ../git-debrebase:2481 +#, perl-format +msgid "" +"Patch export produced patch amendments (abandoned output commit %s). Try " +"laundering first." +msgstr "" +"De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " +"gestaakt). Probeer eerst een wasbeurt te doen." + +#: ../git-debrebase:2501 +#, perl-format +msgid "%s contains comments, which will be discarded" +msgstr "%s bevat commentaar die verwijderd zal worden" + +#: ../git-debrebase:2506 +#, perl-format +msgid "patch %s repeated in %s !" +msgstr "patch %s herhaald in %s !" + +#: ../git-debrebase:2513 +#, perl-format +msgid "Unused patch file %s will be discarded" +msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" + +#: ../git-debrebase:2521 +msgid "ffq-prev exists, this is already managed by git-debrebase!" +msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" + +#: ../git-debrebase:2526 +msgid "ahead of debrebase-last, this is already managed by git-debrebase!" +msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" + +#: ../git-debrebase:2541 +msgid "want only 1 optional argument, the upstream git commitish" +msgstr "" +"wil slechts 1 facultatief argument, de git commitish van de toeleveraar" + +#: ../git-debrebase:2546 +msgid "missing Version from changelog\n" +msgstr "Version vanuit de changelog wordt gemist\n" + +#: ../git-debrebase:2562 +#, perl-format +msgid "" +"upstream (%s) and HEAD are not\n" +"identical in upstream files. See diffstat above, or run\n" +" git diff %s HEAD -- :!/debian :/\n" +msgstr "" +"upstream (%s) en HEAD zijn niet\n" +"identiek in de toeleveraarsbestanden. Zie diffstat hierboven, of voer dit " +"commando uit:\n" +" git diff %s HEAD -- :!/debian :/\n" + +#: ../git-debrebase:2570 +#, perl-format +msgid "upstream (%s) is not an ancestor of HEAD" +msgstr "upstream (%s) is geen voorouder van HEAD" + +#: ../git-debrebase:2577 +#, perl-format +msgid "" +"history between upstream (%s) and HEAD contains direct changes to upstream " +"files - are you sure this is a gbp (patches-unapplied) branch?" +msgstr "" +"de geschiedenis tussen upstream (%s) en HEAD bevat rechtstreekse wijzigingen " +"aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" +"unapplied)(geen toepassing van patches) is?" + +#: ../git-debrebase:2579 +#, perl-format +msgid "list expected changes with: %s\n" +msgstr "toon verwachte wijzigingen met: %s\n" + +#: ../git-debrebase:2586 +#, perl-format +msgid "upstream (%s) contains debian/ directory" +msgstr "upstream (%s) bevat een map debian/" + +#: ../git-debrebase:2604 +msgid "neither of the first two changelog entries are released\n" +msgstr "" +"geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" + +#: ../git-debrebase:2610 +#, perl-format +msgid "could not find suitable maintainer view tag %s\n" +msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" + +#: ../git-debrebase:2613 +#, perl-format +msgid "HEAD is not FF from maintainer tag %s!" +msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" + +#: ../git-debrebase:2616 +#, perl-format +msgid "dgit view tag %s not found\n" +msgstr "dgit-weergavetag %s niet gevonden\n" + +#: ../git-debrebase:2618 +#, perl-format +msgid "dgit view tag %s is not FF from maintainer tag %s\n" +msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" + +#: ../git-debrebase:2620 +#, perl-format +msgid "will stitch in dgit view, %s\n" +msgstr "zal borduren in de dgit-weergave, %s\n" + +#: ../git-debrebase:2627 +#, perl-format +msgid "" +"Cannot confirm dgit view: %s\n" +"Failed to stitch in dgit view (see messages above).\n" +"dgit --overwrite will be needed on the first dgit push after conversion.\n" +msgstr "" +"Kan de dgit-weergave niet bevestigen: %s\n" +"Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" +"dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" + +#: ../git-debrebase:2673 +#, perl-format +msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" +msgstr "" +"%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " +"(patched-unapplied) (gbp), Oké\n" + +#: ../git-debrebase:2702 +#, perl-format +msgid "" +"%s: converted to git-buildpackage branch format\n" +"%s: WARNING: do not now run \"git-debrebase\" any more\n" +"%s: WARNING: doing so would drop all upstream patches!\n" +msgstr "" +"%s: omgezet naar de indeling voor een tak van git-buildpackage\n" +"%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" +"%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" + +#: ../git-debrebase:2723 +msgid "takes 1 optional argument, the upstream commitish" +msgstr "" +"heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" + +#: ../git-debrebase:2731 +#, perl-format +msgid "%s, from command line" +msgstr "%s, van de commandoregel" + +#: ../git-debrebase:2745 +#, perl-format +msgid "" +"%s: Branch already seems to be in git-debrebase format!\n" +"%s: --always-convert-anyway would do the conversion operation anyway\n" +"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" +msgstr "" +"%s: Tak lijkt reeds in git-debrebase-indeling te zijn!\n" +"%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" +"%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" + +#: ../git-debrebase:2749 +msgid "Branch already in git-debrebase format." +msgstr "Tak is reeds in git-debrebase-indeling." + +#: ../git-debrebase:2761 +msgid "Considering possible commits corresponding to upstream:\n" +msgstr "" +"Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " +"toeleveraar:\n" + +#: ../git-debrebase:2768 +#, perl-format +msgid "git tag %s" +msgstr "git tag %s" + +#: ../git-debrebase:2774 +#, perl-format +msgid " git tag: no suitable tag found (tried %s)\n" +msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" + +#: ../git-debrebase:2783 +#, perl-format +msgid "opendir build-products-dir %s: %s" +msgstr "opendir build-products-dir %s: %s" + +#: ../git-debrebase:2789 +#, perl-format +msgid " orig: found what looks like a .orig, %s\n" +msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" + +#: ../git-debrebase:2820 +#, perl-format +msgid " orig: no suitable origs found (looked for %s in %s)\n" +msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" + +#: ../git-debrebase:2829 +msgid "Evaluating possible commits corresponding to upstream:\n" +msgstr "" +"Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " +"toeleveraar:\n" + +#: ../git-debrebase:2866 +#, perl-format +msgid " %s: couldn't apply patches: gbp pq %s" +msgstr " %s: kon patches niet toepassen: gbp pq %s" + +#: ../git-debrebase:2875 +#, perl-format +msgid " %s: applying patches gives different tree\n" +msgstr " %s: patches toepassen geeft een afwijkende boom\n" + +#: ../git-debrebase:2889 +msgid "" +"Could not find or construct a suitable upstream commit.\n" +"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" +"upstream commmit explicitly or provide suitable origs.\n" +msgstr "" +"Kon geen geschikte vastlegging van de toeleveraar vinden of construeren.\n" +"Voer convert-from-dgit-view opnieuw uit met toevoeging van --diagnose,\n" +"of geef expliciet een vastlegging van de toeleveraar op,\n" +"of bezorg geschikte origs.\n" + +#: ../git-debrebase:2895 +#, perl-format +msgid "Yes, will base new branch on %s\n" +msgstr "Ja, zal nieuwe tak baseren op %s\n" + +#: ../git-debrebase:2902 +msgid "forget-was-ever-debrebase takes no further arguments" +msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" + +#: ../git-debrebase:2906 +#, perl-format +msgid "Not suitable for recording git-debrebaseness anyway: %s" +msgstr "" +"Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" + +#: ../git-debrebase:3008 +msgid "bad options\n" +msgstr "foute opties\n" + +#: ../git-debrebase:3018 +#, perl-format +msgid "%s: no cuddling to -i for git-rebase" +msgstr "%s: niet gek van -i voor git-rebase" + +#: ../git-debrebase:3048 +#, perl-format +msgid "unknown git-debrebase sub-operation %s" +msgstr "onbekende onderliggende bewerking van git-debrebase: %s" + +#: ../Debian/Dgit.pm:295 +#, perl-format +msgid "error: %s\n" +msgstr "fout: %s\n" + +#: ../Debian/Dgit.pm:315 +#, perl-format +msgid "getcwd failed: %s\n" +msgstr "getcwd mislukte: %s\n" + +#: ../Debian/Dgit.pm:334 +msgid "terminated, reporting successful completion" +msgstr "beëindigd, met de melding van een succesvolle voltooiing" + +#: ../Debian/Dgit.pm:336 +#, perl-format +msgid "failed with error exit status %s" +msgstr "mislukt met de foutmelding %s" + +#: ../Debian/Dgit.pm:339 +#, perl-format +msgid "died due to fatal signal %s" +msgstr "gestorven vanwege fataal signaal %s" + +#: ../Debian/Dgit.pm:343 +#, perl-format +msgid "failed with unknown wait status %s" +msgstr "mislukt met ongekende wachttoestand %s" + +#: ../Debian/Dgit.pm:349 +msgid "failed command" +msgstr "mislukt commando" + +#: ../Debian/Dgit.pm:355 +#, perl-format +msgid "failed to fork/exec: %s" +msgstr "fork/exec is mislukt: %s" + +#: ../Debian/Dgit.pm:357 +#, perl-format +msgid "subprocess %s" +msgstr "onderliggend proces %s" + +#: ../Debian/Dgit.pm:359 +msgid "subprocess produced invalid output" +msgstr "onderliggend proces produceerde ongeldige uitvoer" + +#: ../Debian/Dgit.pm:450 +msgid "stat source file: %S" +msgstr "stat bronbestand: %S" + +#: ../Debian/Dgit.pm:460 +msgid "stat destination file: %S" +msgstr "stat doelbestand: %S" + +#: ../Debian/Dgit.pm:479 +msgid "finally install file after cp: %S" +msgstr "tot slot, installeer bestand na cp: %S" + +#: ../Debian/Dgit.pm:485 +msgid "delete old file after cp: %S" +msgstr "verwijder oud bestand na cp: %S" + +#: ../Debian/Dgit.pm:506 +msgid "" +"not in a git working tree?\n" +"(git rev-parse --show-toplevel produced no output)\n" +msgstr "" +"niet in een git werkboom?\n" +"(git rev-parse --show-toplevel gaf geen uitvoer)\n" + +#: ../Debian/Dgit.pm:509 +#, perl-format +msgid "chdir toplevel %s: %s\n" +msgstr "chdir naar hoogste niveau %s: %s\n" + +#: ../Debian/Dgit.pm:617 +msgid "git index contains changes (does not match HEAD)" +msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" + +#: ../Debian/Dgit.pm:618 +msgid "working tree is dirty (does not match HEAD)" +msgstr "werkboom is bevuild (komt niet overeen met HEAD)" + +#: ../Debian/Dgit.pm:689 +msgid "detached HEAD" +msgstr "vrijstaande HEAD (detached HEAD)" + +#: ../Debian/Dgit.pm:690 +msgid "HEAD symref is not to refs/" +msgstr "symbolische referentie HEAD is geen referentie naar refs/" + +#: ../Debian/Dgit.pm:706 +#, perl-format +msgid "parsing of %s failed" +msgstr "ontleden van %s mislukte" + +#: ../Debian/Dgit.pm:715 +#, perl-format +msgid "" +"control file %s is (already) PGP-signed. Note that dgit push needs to " +"modify the .dsc and then do the signature itself" +msgstr "" +"controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit " +"push het .dsc moet aanpassen en het dan zelf moet ondertekenen" + +#: ../Debian/Dgit.pm:729 +#, perl-format +msgid "open %s (%s): %s" +msgstr "open %s (%s): %s" + +#: ../Debian/Dgit.pm:750 +#, perl-format +msgid "missing field %s in %s" +msgstr "ontbrekend veld %s in %s" + +#: ../Debian/Dgit.pm:822 +msgid "Dummy commit - do not use\n" +msgstr "Voorbeeldvastlegging - niet gebruiken\n" + +#: ../Debian/Dgit.pm:843 +#, perl-format +msgid "exec %s: %s\n" +msgstr "exec %s: %s\n" + +#: ../Debian/Dgit.pm:911 +#, perl-format +msgid "cannot stat %s/.git: %s" +msgstr "kan status van %s/.git niet verkrijgen: %s" + +#: ../Debian/Dgit.pm:934 +#, perl-format +msgid "failed to mkdir playground parent %s: %s" +msgstr "mkdir van speelplaatsouder %s mislukte: %s" + +#: ../Debian/Dgit.pm:942 +#, perl-format +msgid "failed to mkdir a playground %s: %s" +msgstr "mkdir van een speelplaats %s mislukte: %s" + +#: ../Debian/Dgit.pm:951 +#, perl-format +msgid "failed to mkdir the playground %s: %s" +msgstr "mkdir van de speelplaats %s mislukte: %s" -- cgit v1.2.3 From aa57a5799afda71dd5750b05bfaccd9ec74e5c08 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Jan 2019 17:50:48 +0000 Subject: i18n-commit - autogenerated --- po/en_US.po | 736 ++++++++++++++++++++------------------ po/messages.pot | 736 ++++++++++++++++++++------------------ po/nl.po | 762 ++++++++++++++++++++++------------------ po4a/dgit-maint-debrebase_7.pot | 293 ++++++++------- po4a/dgit_1.pot | 537 +++++++++++++++------------- po4a/git-debrebase_1.pot | 219 +++++++----- 6 files changed, 1789 insertions(+), 1494 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index df78b26..0e4ddfb 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: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -33,7 +33,7 @@ msgstr "" #: ../dgit:260 #, perl-format -msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "" #: ../dgit:483 @@ -440,49 +440,95 @@ msgstr "" msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, perl-format +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, perl-format +msgid "check orig file %s in ..: %s" +msgstr "" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, perl-format +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "" + +#: ../dgit:2249 +#, perl-format +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "" + +#: ../dgit:2252 +#, perl-format +msgid "failed to make %s a hardlink to %s: %s" +msgstr "" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -491,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -514,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2773 +#: ../dgit:2844 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2817 +#: ../dgit:2888 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2832 +#: ../dgit:2903 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:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -568,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:2988 +#: ../dgit:3059 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:2998 +#: ../dgit:3069 #, 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:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -619,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "" -#: ../dgit:3035 +#: ../dgit:3106 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3041 +#: ../dgit:3112 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -676,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -692,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -702,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -710,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -732,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3507 +#: ../dgit:3579 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -763,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3652 +#: ../dgit:3724 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -794,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -803,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "" -#: ../dgit:3804 +#: ../dgit:3879 #, 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:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3842 +#: ../dgit:3917 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3861 +#: ../dgit:3936 #, 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:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:3975 +#: ../dgit:4050 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4053 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3986 +#: ../dgit:4061 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "" -#: ../dgit:4120 +#: ../dgit:4195 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4190 +#: ../dgit:4265 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4251 +#: ../dgit:4326 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4344 +#: ../dgit:4419 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:4353 +#: ../dgit:4428 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4381 +#: ../dgit:4456 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1053,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1068,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4503 +#: ../dgit:4578 #, 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:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1093,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4546 +#: ../dgit:4621 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4550 +#: ../dgit:4625 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4635 +#: ../dgit:4710 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:4652 +#: ../dgit:4727 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" @@ -1147,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4695 +#: ../dgit:4770 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4785 +#: ../dgit:4860 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4892 +#: ../dgit:4967 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1303,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5349 +#: ../dgit:5424 #, 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:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1335,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5379 +#: ../dgit:5454 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1353,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5569 +#: ../dgit:5644 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1417,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5708 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5914 +#: ../dgit:5992 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6052 +#: ../dgit:6130 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" @@ -1486,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6103 +#: ../dgit:6181 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6106 +#: ../dgit:6184 #, 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:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6116 +#: ../dgit:6194 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6129 +#: ../dgit:6207 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6136 +#: ../dgit:6214 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1546,98 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6273 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6223 -#, perl-format +#: ../dgit:6302 msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\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:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6240 +#: ../dgit:6317 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6352 +#: ../dgit:6432 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1645,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "" -#: ../dgit:6506 +#: ../dgit:6586 #, 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:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6738 +#: ../dgit:6818 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:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6754 +#: ../dgit:6834 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:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6889 +#: ../dgit:6969 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1782,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -1804,139 +1854,139 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:6939 +#: ../dgit:7019 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:6943 +#: ../dgit:7023 #, perl-format msgid "import %s requires .../%s, but it does not exist" msgstr "" -#: ../dgit:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "" -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7027 +#: ../dgit:7107 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7329 +#: ../dgit:7414 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1944,44 +1994,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7404 +#: ../dgit:7489 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1994,7 +2044,7 @@ msgid "" " git-debrebase [] prepush [--prose=...]\n" " git-debrebase [] quick|conclude\n" " git-debrebase [] new-upstream [
]\n" -" git-debrebase [] convert-from-gbp []\n" +" git-debrebase [] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2479,15 +2529,15 @@ msgstr "" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2495,58 +2545,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2554,12 +2604,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2567,16 +2617,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2584,84 +2634,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 9506b59..840de39 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,7 @@ msgstr "" #: ../dgit:260 #, perl-format -msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "" #: ../dgit:483 @@ -440,49 +440,95 @@ msgstr "" msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, perl-format +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, perl-format +msgid "check orig file %s in ..: %s" +msgstr "" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, perl-format +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "" + +#: ../dgit:2249 +#, perl-format +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "" + +#: ../dgit:2252 +#, perl-format +msgid "failed to make %s a hardlink to %s: %s" +msgstr "" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -491,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -514,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2773 +#: ../dgit:2844 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2817 +#: ../dgit:2888 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2832 +#: ../dgit:2903 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:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -568,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:2988 +#: ../dgit:3059 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:2998 +#: ../dgit:3069 #, 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:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -619,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "" -#: ../dgit:3035 +#: ../dgit:3106 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3041 +#: ../dgit:3112 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -676,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -692,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -702,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -710,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -732,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3507 +#: ../dgit:3579 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -763,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3652 +#: ../dgit:3724 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -794,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -803,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "" -#: ../dgit:3804 +#: ../dgit:3879 #, 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:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3842 +#: ../dgit:3917 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3861 +#: ../dgit:3936 #, 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:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:3975 +#: ../dgit:4050 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4053 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:3986 +#: ../dgit:4061 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "" -#: ../dgit:4120 +#: ../dgit:4195 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4190 +#: ../dgit:4265 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4251 +#: ../dgit:4326 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4344 +#: ../dgit:4419 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:4353 +#: ../dgit:4428 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4381 +#: ../dgit:4456 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1053,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1068,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4503 +#: ../dgit:4578 #, 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:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1093,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4546 +#: ../dgit:4621 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4550 +#: ../dgit:4625 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4635 +#: ../dgit:4710 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:4652 +#: ../dgit:4727 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" @@ -1147,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4695 +#: ../dgit:4770 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4785 +#: ../dgit:4860 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4892 +#: ../dgit:4967 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1303,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5349 +#: ../dgit:5424 #, 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:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1335,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5379 +#: ../dgit:5454 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1353,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5569 +#: ../dgit:5644 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1417,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "" -#: ../dgit:5633 +#: ../dgit:5708 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5914 +#: ../dgit:5992 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6052 +#: ../dgit:6130 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" @@ -1486,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6103 +#: ../dgit:6181 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6106 +#: ../dgit:6184 #, 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:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6116 +#: ../dgit:6194 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6129 +#: ../dgit:6207 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6136 +#: ../dgit:6214 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1546,98 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6195 +#: ../dgit:6273 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6223 -#, perl-format +#: ../dgit:6302 msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\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:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6240 +#: ../dgit:6317 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6352 +#: ../dgit:6432 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1645,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "" -#: ../dgit:6506 +#: ../dgit:6586 #, 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:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6738 +#: ../dgit:6818 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:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6754 +#: ../dgit:6834 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:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6889 +#: ../dgit:6969 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1782,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -1804,139 +1854,139 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:6939 +#: ../dgit:7019 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:6943 +#: ../dgit:7023 #, perl-format msgid "import %s requires .../%s, but it does not exist" msgstr "" -#: ../dgit:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "" -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7027 +#: ../dgit:7107 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7329 +#: ../dgit:7414 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1944,44 +1994,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7404 +#: ../dgit:7489 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1994,7 +2044,7 @@ msgid "" " git-debrebase [] prepush [--prose=...]\n" " git-debrebase [] quick|conclude\n" " git-debrebase [] new-upstream [
]\n" -" git-debrebase [] convert-from-gbp []\n" +" git-debrebase [] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2479,15 +2529,15 @@ msgstr "" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2495,58 +2545,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2554,12 +2604,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2567,16 +2617,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2584,84 +2634,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/nl.po b/po/nl.po index 6d62a8d..34ea558 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_8.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-13 19:41+0000\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: 2018-12-05 20:40+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -35,8 +35,9 @@ msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" #: ../dgit:260 -#, perl-format -msgid "%s: package %s does not exist in suite %s\n" +#, fuzzy, perl-format +#| msgid "%s: package %s does not exist in suite %s\n" +msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: pakket %s bestaat niet in suite %s\n" #: ../dgit:483 @@ -510,49 +511,100 @@ msgstr "(basis)-distributie wordt benaderd" msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2218 ../dgit:2223 +#: ../dgit:2202 +#, fuzzy, perl-format +#| msgid "opendir build-products-dir %s: %s" +msgid "build-products-dir %s is not accessible: %s\n" +msgstr "opendir build-products-dir %s: %s" + +#: ../dgit:2227 +#, perl-format +msgid "" +"%s: found orig(s) in .. missing from build-products-dir, transferring:\n" +msgstr "" + +#: ../dgit:2231 +#, perl-format +msgid "check orig file %s in bpd %s: %s" +msgstr "" + +#: ../dgit:2233 +#, fuzzy, perl-format +#| msgid "missing field %s in %s" +msgid "check orig file %s in ..: %s" +msgstr "ontbrekend veld %s in %s" + +#: ../dgit:2236 +#, perl-format +msgid "check targe of orig symlink %s in ..: %s" +msgstr "" + +#: ../dgit:2245 +#, fuzzy, perl-format +#| msgid "%s: warning: removing from %s: %s\n" +msgid "%s: cloned orig symlink from ..: %s\n" +msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" + +#: ../dgit:2249 +#, fuzzy, perl-format +#| msgid "%s: warning: removing from %s: %s\n" +msgid "%s: hardlinked orig from ..: %s\n" +msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" + +#: ../dgit:2252 +#, fuzzy, perl-format +#| msgid "failed to mkdir a playground %s: %s" +msgid "failed to make %s a hardlink to %s: %s" +msgstr "mkdir van een speelplaats %s mislukte: %s" + +#: ../dgit:2258 +#, perl-format +msgid "%s: symmlinked orig from .. on other filesystem: %s\n" +msgstr "" + +#: ../dgit:2290 ../dgit:2295 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2238 ../dgit:2245 +#: ../dgit:2310 ../dgit:2317 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2311 +#: ../dgit:2382 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2375 ../dgit:5892 +#: ../dgit:2446 ../dgit:5970 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2393 +#: ../dgit:2464 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2433 +#: ../dgit:2504 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2452 +#: ../dgit:2523 #, perl-format msgid "Import %s" msgstr "Importeren van %s" -#: ../dgit:2533 +#: ../dgit:2604 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2552 +#: ../dgit:2623 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2561 +#: ../dgit:2632 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -565,21 +617,21 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2576 +#: ../dgit:2647 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2580 +#: ../dgit:2651 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2593 +#: ../dgit:2664 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "Gegeven %s (%s) uit archiefsuite %s\n" -#: ../dgit:2597 +#: ../dgit:2668 #, perl-format msgid "" "\n" @@ -592,12 +644,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2639 +#: ../dgit:2710 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2643 +#: ../dgit:2714 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -606,12 +658,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2647 +#: ../dgit:2718 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2663 +#: ../dgit:2734 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -619,24 +671,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2758 +#: ../dgit:2829 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2773 +#: ../dgit:2844 #, 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:2817 +#: ../dgit:2888 #, 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:2832 +#: ../dgit:2903 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" @@ -646,7 +698,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:2837 +#: ../dgit:2908 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -662,44 +714,44 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2904 +#: ../dgit:2975 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" -#: ../dgit:2953 +#: ../dgit:3024 #, perl-format msgid "%s: NO git hash" msgstr "%s: GEEN hash van git" -#: ../dgit:2957 +#: ../dgit:3028 #, perl-format msgid "%s: specified git info (%s)" msgstr "%s: git info werd opgegeven (%s)" -#: ../dgit:2964 +#: ../dgit:3035 #, perl-format msgid "%s: specified git hash" msgstr "%s: git hash werd opgegeven" -#: ../dgit:2966 +#: ../dgit:3037 #, perl-format msgid "%s: invalid Dgit info" msgstr "%s: ongeldige Dgit info" -#: ../dgit:2988 +#: ../dgit:3059 #, 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:2993 +#: ../dgit:3064 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:2998 +#: ../dgit:3069 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -708,7 +760,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:3008 +#: ../dgit:3079 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -721,30 +773,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:3028 +#: ../dgit:3099 msgid "rewrite map" msgstr "modificatieplan (rewrite map) " -#: ../dgit:3035 +#: ../dgit:3106 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:3039 +#: ../dgit:3110 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3041 +#: ../dgit:3112 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:3048 +#: ../dgit:3119 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3051 +#: ../dgit:3122 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -753,27 +805,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3075 +#: ../dgit:3147 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3079 +#: ../dgit:3151 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3162 +#: ../dgit:3234 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3169 +#: ../dgit:3241 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3174 +#: ../dgit:3246 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3202 +#: ../dgit:3274 #, perl-format msgid "" "\n" @@ -789,15 +841,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3215 +#: ../dgit:3287 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3218 +#: ../dgit:3290 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3239 +#: ../dgit:3311 #, perl-format msgid "" "\n" @@ -809,7 +861,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3248 +#: ../dgit:3320 #, perl-format msgid "" "\n" @@ -824,7 +876,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3333 +#: ../dgit:3405 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -835,19 +887,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3346 +#: ../dgit:3418 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3364 +#: ../dgit:3436 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3366 +#: ../dgit:3438 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3377 +#: ../dgit:3449 #, perl-format msgid "" "\n" @@ -863,15 +915,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3392 +#: ../dgit:3464 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3428 +#: ../dgit:3500 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3493 +#: ../dgit:3565 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -879,16 +931,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3507 +#: ../dgit:3579 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:3522 +#: ../dgit:3594 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3549 +#: ../dgit:3621 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -899,32 +951,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3571 +#: ../dgit:3643 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3579 +#: ../dgit:3651 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3618 +#: ../dgit:3690 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3650 +#: ../dgit:3722 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3652 +#: ../dgit:3724 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:3691 +#: ../dgit:3763 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -935,7 +987,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3705 +#: ../dgit:3777 msgid "" "\n" "Key\n" @@ -949,34 +1001,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3720 +#: ../dgit:3792 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3738 +#: ../dgit:3810 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3746 +#: ../dgit:3818 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3763 +#: ../dgit:3833 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3774 +#: ../dgit:3849 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3778 +#: ../dgit:3853 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3804 +#: ../dgit:3879 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -986,33 +1038,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3809 +#: ../dgit:3884 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3821 +#: ../dgit:3896 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3823 +#: ../dgit:3898 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3831 +#: ../dgit:3906 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3842 +#: ../dgit:3917 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:3861 +#: ../dgit:3936 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1021,15 +1073,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:3878 +#: ../dgit:3953 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3881 +#: ../dgit:3956 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3885 +#: ../dgit:3960 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1037,7 +1089,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:3928 +#: ../dgit:4003 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1045,60 +1097,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:3933 +#: ../dgit:4008 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:3943 +#: ../dgit:4018 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:3949 +#: ../dgit:4024 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:3975 +#: ../dgit:4050 #, 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:3978 +#: ../dgit:4053 #, 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:3986 +#: ../dgit:4061 #, 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:3995 +#: ../dgit:4070 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4004 +#: ../dgit:4079 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4012 +#: ../dgit:4087 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4022 +#: ../dgit:4097 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4025 +#: ../dgit:4100 #, perl-format msgid "" "%s is %s\n" @@ -1107,81 +1159,81 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4039 +#: ../dgit:4114 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4095 +#: ../dgit:4170 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4104 +#: ../dgit:4179 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4106 +#: ../dgit:4181 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4107 +#: ../dgit:4182 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4120 +#: ../dgit:4195 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:4130 +#: ../dgit:4205 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4131 +#: ../dgit:4206 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4135 +#: ../dgit:4210 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4148 +#: ../dgit:4223 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4156 +#: ../dgit:4231 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4168 +#: ../dgit:4243 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4190 +#: ../dgit:4265 #, 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:4251 +#: ../dgit:4326 #, 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:4279 +#: ../dgit:4354 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "%s release %s voor %s (%s) [dgit]\n" -#: ../dgit:4292 +#: ../dgit:4367 #, perl-format msgid "" "%s release %s for %s (%s)\n" @@ -1190,7 +1242,7 @@ msgstr "" "%s release %s voor %s (%s)\n" "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4344 +#: ../dgit:4419 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1199,14 +1251,14 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4353 +#: ../dgit:4428 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:4358 +#: ../dgit:4433 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1215,12 +1267,12 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4381 +#: ../dgit:4456 #, 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:4398 +#: ../dgit:4473 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1233,7 +1285,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:4422 +#: ../dgit:4497 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1242,7 +1294,7 @@ msgstr "" "--quilt=%s maar geen gecachete dgit-weergave:\n" " werd HEAD misschien gewijzigd sinds dgit build[-source]?" -#: ../dgit:4453 +#: ../dgit:4528 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1255,17 +1307,17 @@ msgstr "" "Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " "u --deliberately-not-fast-forward." -#: ../dgit:4463 +#: ../dgit:4538 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "bezig na te gaan dat %s overeenkomt met HEAD" -#: ../dgit:4497 ../dgit:4509 +#: ../dgit:4572 ../dgit:4584 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "HEAD geeft een andere boom op aan %s:\n" -#: ../dgit:4503 +#: ../dgit:4578 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" @@ -1274,7 +1326,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:4513 +#: ../dgit:4588 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1286,7 +1338,7 @@ msgstr "" "zien,\n" " gebruikt u git diff %s %s\n" -#: ../dgit:4524 +#: ../dgit:4599 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1295,19 +1347,19 @@ msgstr "" "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " "u dgit -C gebruiken" -#: ../dgit:4546 +#: ../dgit:4621 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:4550 +#: ../dgit:4625 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:4554 +#: ../dgit:4629 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" @@ -1317,12 +1369,12 @@ msgstr "" "is\n" "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" -#: ../dgit:4561 +#: ../dgit:4636 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" -#: ../dgit:4605 +#: ../dgit:4680 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1331,7 +1383,7 @@ msgstr "" "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " "probleem.\n" -#: ../dgit:4618 +#: ../dgit:4693 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1340,7 +1392,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4635 +#: ../dgit:4710 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" @@ -1350,7 +1402,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4652 +#: ../dgit:4727 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" @@ -1368,84 +1420,84 @@ msgstr "" "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4683 +#: ../dgit:4758 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:4695 +#: ../dgit:4770 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:4706 +#: ../dgit:4781 msgid "incorrect arguments to dgit clone" msgstr "incorrecte argumenten voor dgit clone" -#: ../dgit:4712 ../git-debrebase:1839 +#: ../dgit:4787 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:4726 +#: ../dgit:4801 #, perl-format msgid "remove %s: %s\n" msgstr "verwijder %s: %s\n" -#: ../dgit:4730 +#: ../dgit:4805 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleer of %s moet verwijderd worden: %s\n" -#: ../dgit:4768 +#: ../dgit:4843 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "incorrecte argumenten voor dgit fetch of dgit pull" -#: ../dgit:4785 +#: ../dgit:4860 #, 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:4794 +#: ../dgit:4869 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout heeft een suite nodig als argument" -#: ../dgit:4856 +#: ../dgit:4931 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "bezig met opzetten van vcs-git: %s\n" -#: ../dgit:4859 +#: ../dgit:4934 #, perl-format msgid "vcs git already configured: %s\n" msgstr "vcs git is reeds geconfigureerd: %s\n" -#: ../dgit:4861 +#: ../dgit:4936 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "url van vcs-git wordt veranderd naar: %s\n" -#: ../dgit:4866 +#: ../dgit:4941 #, perl-format msgid "fetching (%s)\n" msgstr "bezig met ophalen (%s)\n" -#: ../dgit:4881 +#: ../dgit:4956 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "incorrecte argumenten voor dgit %s" -#: ../dgit:4892 +#: ../dgit:4967 #, 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:4930 +#: ../dgit:5005 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1453,34 +1505,34 @@ msgstr "" "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " "de aanroepende computer zijn %s" -#: ../dgit:5010 +#: ../dgit:5085 #, perl-format msgid "create %s: %s" msgstr "maak %s aan: %s" -#: ../dgit:5047 +#: ../dgit:5122 #, perl-format msgid "build host child failed: %s" msgstr "dochterproces op de bouwcomputer faalde: %s" -#: ../dgit:5050 +#: ../dgit:5125 msgid "all done\n" msgstr "alles klaar\n" -#: ../dgit:5059 +#: ../dgit:5134 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5067 +#: ../dgit:5142 msgid "bad param spec" msgstr "slechte parameter-spec" -#: ../dgit:5073 +#: ../dgit:5148 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5092 +#: ../dgit:5167 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" @@ -1488,45 +1540,45 @@ msgstr "" "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " "%s niet ondersteunt" -#: ../dgit:5137 +#: ../dgit:5212 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "buildinfo-incongruentie in veld %s" -#: ../dgit:5140 +#: ../dgit:5215 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "buildinfo bevat ongeoorloofd veld %s" -#: ../dgit:5181 +#: ../dgit:5256 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5256 +#: ../dgit:5331 msgid "not a plain file or symlink\n" msgstr "geen echt bestand of symbolische koppeling\n" -#: ../dgit:5262 +#: ../dgit:5337 msgid "mode or type changed\n" msgstr "modus of type gewijzigd\n" -#: ../dgit:5263 +#: ../dgit:5338 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5266 +#: ../dgit:5341 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5270 +#: ../dgit:5345 msgid "creation with non-default mode\n" msgstr "creatie met een niet-standaard modus\n" -#: ../dgit:5300 +#: ../dgit:5375 msgid "dgit view: changes are required..." msgstr "dgit-weergave: er zijn wijzigingen vereist..." -#: ../dgit:5329 +#: ../dgit:5404 #, perl-format msgid "" "\n" @@ -1537,7 +1589,7 @@ msgstr "" "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" " %s\n" -#: ../dgit:5336 +#: ../dgit:5411 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1547,7 +1599,7 @@ msgstr "" " (een git-boom zonder dat de patches toegepast worden)\n" " maar de git-boom verschilt van orig in de toeleveraarsbestanden." -#: ../dgit:5342 +#: ../dgit:5417 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1556,7 +1608,7 @@ msgstr "" " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" "wachtrij?" -#: ../dgit:5349 +#: ../dgit:5424 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1567,12 +1619,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:5356 +#: ../dgit:5431 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" -#: ../dgit:5365 +#: ../dgit:5440 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1583,20 +1635,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:5374 +#: ../dgit:5449 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " "representeren" -#: ../dgit:5379 +#: ../dgit:5454 #, 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:5384 +#: ../dgit:5459 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1611,43 +1663,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:5406 +#: ../dgit:5481 msgid "Commit patch to update .gitignore\n" msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" -#: ../dgit:5420 +#: ../dgit:5495 msgid "converted" msgstr "omgezet" -#: ../dgit:5421 +#: ../dgit:5496 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5486 +#: ../dgit:5561 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5504 +#: ../dgit:5579 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5513 +#: ../dgit:5588 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5519 +#: ../dgit:5594 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5531 +#: ../dgit:5606 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5550 +#: ../dgit:5625 #, perl-format msgid "" "\n" @@ -1656,23 +1708,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5557 +#: ../dgit:5632 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5569 +#: ../dgit:5644 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:5572 +#: ../dgit:5647 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5584 +#: ../dgit:5659 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1683,72 +1735,72 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5591 +#: ../dgit:5666 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5625 +#: ../dgit:5700 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5626 +#: ../dgit:5701 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5627 +#: ../dgit:5702 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5628 +#: ../dgit:5703 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5629 +#: ../dgit:5704 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5633 +#: ../dgit:5708 #, 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:5662 +#: ../dgit:5737 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5802 +#: ../dgit:5880 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5812 +#: ../dgit:5890 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5914 +#: ../dgit:5992 #, 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:5945 +#: ../dgit:6023 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:5950 +#: ../dgit:6028 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:5961 +#: ../dgit:6039 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6052 +#: ../dgit:6130 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" @@ -1762,16 +1814,16 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6066 +#: ../dgit:6144 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6103 +#: ../dgit:6181 #, 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:6106 +#: ../dgit:6184 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1780,49 +1832,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:6112 +#: ../dgit:6190 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6116 +#: ../dgit:6194 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:6123 +#: ../dgit:6201 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6126 +#: ../dgit:6204 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6129 +#: ../dgit:6207 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:6132 +#: ../dgit:6210 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6136 +#: ../dgit:6214 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:6145 +#: ../dgit:6223 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6183 +#: ../dgit:6261 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1837,18 +1889,22 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6195 +#: ../dgit:6273 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:6223 -#, perl-format +#: ../dgit:6302 +#, fuzzy +#| msgid "" +#| "%s\n" +#| "If this is just missing .gitignore entries, use a different clean\n" +#| "mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" +#| "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgid "" -"%s\n" "If this is just missing .gitignore entries, use a different clean\n" -"mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\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 "" "%s\n" @@ -1858,91 +1914,97 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6237 +#: ../dgit:6314 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6240 +#: ../dgit:6317 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:6261 +#: ../dgit:6320 +msgid "" +"tree contains uncommited, untracked, unignored files\n" +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +msgstr "" + +#: ../dgit:6338 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6275 +#: ../dgit:6352 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6288 +#: ../dgit:6365 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "-p is niet toegestaan met dgit %s" -#: ../dgit:6324 +#: ../dgit:6404 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6326 +#: ../dgit:6406 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6352 +#: ../dgit:6432 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:6358 +#: ../dgit:6438 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6361 +#: ../dgit:6441 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:6404 +#: ../dgit:6484 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6442 +#: ../dgit:6522 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6449 +#: ../dgit:6529 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6456 +#: ../dgit:6536 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6460 +#: ../dgit:6540 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6465 +#: ../dgit:6545 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6468 +#: ../dgit:6548 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6481 +#: ../dgit:6561 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1954,11 +2016,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6499 +#: ../dgit:6579 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6506 +#: ../dgit:6586 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1969,30 +2031,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6616 +#: ../dgit:6696 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6651 +#: ../dgit:6731 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6671 +#: ../dgit:6751 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6684 +#: ../dgit:6764 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6688 +#: ../dgit:6768 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6695 +#: ../dgit:6775 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2000,21 +2062,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6701 +#: ../dgit:6781 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6703 +#: ../dgit:6783 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6723 ../dgit:6725 +#: ../dgit:6803 ../dgit:6805 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6738 +#: ../dgit:6818 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" @@ -2023,7 +2085,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6750 +#: ../dgit:6830 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2031,7 +2093,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6754 +#: ../dgit:6834 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2040,65 +2102,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6784 +#: ../dgit:6864 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6806 +#: ../dgit:6886 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6808 +#: ../dgit:6888 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6821 +#: ../dgit:6901 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6825 +#: ../dgit:6905 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6829 +#: ../dgit:6909 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6846 +#: ../dgit:6926 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6851 +#: ../dgit:6931 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6853 +#: ../dgit:6933 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6864 +#: ../dgit:6944 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6867 +#: ../dgit:6947 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6878 +#: ../dgit:6958 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6889 +#: ../dgit:6969 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:6898 +#: ../dgit:6978 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2109,21 +2171,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:6905 +#: ../dgit:6985 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6907 +#: ../dgit:6987 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6912 +#: ../dgit:6992 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:6917 +#: ../dgit:6997 #, perl-format msgid "" "Branch %s already exists\n" @@ -2135,98 +2197,98 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:6929 +#: ../dgit:7009 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:6931 +#: ../dgit:7011 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:6939 +#: ../dgit:7019 #, 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:6943 +#: ../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:6948 +#: ../dgit:7028 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:6950 +#: ../dgit:7030 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:6951 +#: ../dgit:7031 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:6962 +#: ../dgit:7042 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:6964 +#: ../dgit:7044 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:6978 +#: ../dgit:7058 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:6987 +#: ../dgit:7067 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:6994 +#: ../dgit:7074 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7000 +#: ../dgit:7080 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7014 +#: ../dgit:7094 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7019 +#: ../dgit:7099 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7027 +#: ../dgit:7107 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:7038 +#: ../dgit:7118 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7044 +#: ../dgit:7124 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7051 ../dgit:7057 +#: ../dgit:7131 ../dgit:7137 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7063 +#: ../dgit:7143 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7110 +#: ../dgit:7190 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2234,42 +2296,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7149 +#: ../dgit:7229 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7153 +#: ../dgit:7233 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7238 +#: ../dgit:7324 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7258 +#: ../dgit:7344 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7314 +#: ../dgit:7399 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7329 +#: ../dgit:7414 #, 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:7333 +#: ../dgit:7418 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7339 +#: ../dgit:7424 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2280,53 +2342,65 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7356 +#: ../dgit:7441 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7369 +#: ../dgit:7454 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7389 +#: ../dgit:7474 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7399 +#: ../dgit:7484 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7404 +#: ../dgit:7489 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:7415 +#: ../dgit:7500 #, perl-format msgid "unknown clean-mode `%s'" msgstr "onbekende clean-modus `%s'" -#: ../dgit:7436 +#: ../dgit:7521 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7437 +#: ../dgit:7522 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7456 +#: ../dgit:7541 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" #: ../git-debrebase:44 +#, fuzzy +#| msgid "" +#| "usages:\n" +#| " git-debrebase [] [--|-i ]\n" +#| " git-debrebase [] status\n" +#| " git-debrebase [] prepush [--prose=...]\n" +#| " git-debrebase [] quick|conclude\n" +#| " git-debrebase [] new-upstream [
]\n" +#| " git-debrebase [] convert-from-gbp []\n" +#| " ...\n" +#| "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in " +#| "dgit).\n" msgid "" "usages:\n" " git-debrebase [] [--|-i ]\n" @@ -2334,7 +2408,7 @@ msgid "" " git-debrebase [] prepush [--prose=...]\n" " git-debrebase [] quick|conclude\n" " git-debrebase [] new-upstream [
]\n" -" git-debrebase [] convert-from-gbp []\n" +" git-debrebase [] convert-from-* ...\n" " ...\n" "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" msgstr "" @@ -2864,16 +2938,16 @@ msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2541 +#: ../git-debrebase:2542 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2546 +#: ../git-debrebase:2547 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2562 +#: ../git-debrebase:2563 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2885,12 +2959,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2570 +#: ../git-debrebase:2571 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2577 +#: ../git-debrebase:2578 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2900,47 +2974,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2579 +#: ../git-debrebase:2580 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2586 +#: ../git-debrebase:2587 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2604 +#: ../git-debrebase:2605 msgid "neither of the first two changelog entries are released\n" msgstr "" "geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" -#: ../git-debrebase:2610 +#: ../git-debrebase:2611 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2613 +#: ../git-debrebase:2614 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2616 +#: ../git-debrebase:2617 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2618 +#: ../git-debrebase:2619 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" -#: ../git-debrebase:2620 +#: ../git-debrebase:2621 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2627 +#: ../git-debrebase:2628 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2951,14 +3025,14 @@ msgstr "" "Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" "dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" -#: ../git-debrebase:2673 +#: ../git-debrebase:2674 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" "%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " "(patched-unapplied) (gbp), Oké\n" -#: ../git-debrebase:2702 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2969,17 +3043,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2723 +#: ../git-debrebase:2724 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2731 +#: ../git-debrebase:2732 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2745 +#: ../git-debrebase:2746 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2990,58 +3064,58 @@ msgstr "" "%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" "%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" -#: ../git-debrebase:2749 +#: ../git-debrebase:2750 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2761 +#: ../git-debrebase:2762 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2768 +#: ../git-debrebase:2769 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2774 +#: ../git-debrebase:2775 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2783 +#: ../git-debrebase:2784 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2789 +#: ../git-debrebase:2790 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" -#: ../git-debrebase:2820 +#: ../git-debrebase:2821 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" -#: ../git-debrebase:2829 +#: ../git-debrebase:2830 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2866 +#: ../git-debrebase:2867 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2875 +#: ../git-debrebase:2876 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2889 +#: ../git-debrebase:2890 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -3052,31 +3126,31 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2895 +#: ../git-debrebase:2896 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2902 +#: ../git-debrebase:2903 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2906 +#: ../git-debrebase:2907 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" "Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" -#: ../git-debrebase:3008 +#: ../git-debrebase:3009 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:3018 +#: ../git-debrebase:3019 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:3048 +#: ../git-debrebase:3049 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 5161500..b937feb 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: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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" @@ -68,7 +68,7 @@ msgstr "" #. type: =head3 #: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 #: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-debrebase.7.pod:326 msgid "When upstream tags releases in git" msgstr "" @@ -107,7 +107,7 @@ msgstr "" #. type: verbatim #: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388 #, no-wrap msgid "" " % git deborig\n" @@ -129,7 +129,7 @@ msgstr "" #. type: =head3 #: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 #: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:329 +#: ../dgit-maint-debrebase.7.pod:334 msgid "When upstream releases only tarballs" msgstr "" @@ -246,24 +246,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294 msgid "" "To achieve this, you might need to delete I. " "One way to have dgit check your progress is to run B." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330 #, no-wrap msgid "" " % git remote update\n" @@ -271,7 +271,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336 msgid "" "You will need the I from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -280,12 +280,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -293,12 +293,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:353 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -306,7 +306,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -314,12 +314,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546 msgid "" "The easiest way to handle this is to add a B field to " "I, and a B setting in I. " @@ -329,18 +329,18 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-debrebase.7.pod:551 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-debrebase.7.pod:751 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753 msgid "" "This tutorial was written and is maintained by Sean Whitton " ". It contains contributions from other dgit " @@ -348,7 +348,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298 msgid "GIT CONFIGURATION" msgstr "" @@ -577,18 +577,27 @@ msgid "" "Use" msgstr "" -#. type: =item +#. type: textblock #: ../dgit-maint-debrebase.7.pod:272 +msgid "" +"If you were not previously using dgit to upload your package (i.e. you were " +"not using the workflow described in dgit-maint-gbp(7)), and you happen to " +"have run B in this clone of the repository, you will need to " +"pass I<--fdiverged> to this command." +msgstr "" + +#. type: =item +#: ../dgit-maint-debrebase.7.pod:277 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:274 +#: ../dgit-maint-debrebase.7.pod:279 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:278 +#: ../dgit-maint-debrebase.7.pod:283 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -596,7 +605,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:284 +#: ../dgit-maint-debrebase.7.pod:289 msgid "" "Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it " "is exactly what you would get if you deleted .git, invoked B to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -612,7 +621,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:302 +#: ../dgit-maint-debrebase.7.pod:307 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -620,14 +629,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:306 +#: ../dgit-maint-debrebase.7.pod:311 msgid "" "Now when you pull work from other Debian contributors, git will rebase your " "work on top of theirs." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:309 +#: ../dgit-maint-debrebase.7.pod:314 msgid "" "If you use this clone for upstream development in addition to Debian " "packaging work, you may not want to set this global setting. Instead, see " @@ -636,24 +645,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:314 +#: ../dgit-maint-debrebase.7.pod:319 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:316 +#: ../dgit-maint-debrebase.7.pod:321 msgid "" "There are two steps: obtaining git refs that correspond to the new release, " "and importing that release using git-debrebase(1)." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-debrebase.7.pod:357 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:356 +#: ../dgit-maint-debrebase.7.pod:361 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -661,7 +670,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-debrebase.7.pod:365 msgid "" "This invocation of git-debrebase(1) involves a git rebase. You may need to " "resolve conflicts if the Debian delta queue does not apply cleanly to the " @@ -669,13 +678,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:364 +#: ../dgit-maint-debrebase.7.pod:369 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:369 +#: ../dgit-maint-debrebase.7.pod:374 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -683,7 +692,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:373 +#: ../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 " @@ -691,27 +700,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:387 +#: ../dgit-maint-debrebase.7.pod:392 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-debrebase.7.pod:394 msgid "Just make commits on master that change the contents of I." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:391 +#: ../dgit-maint-debrebase.7.pod:396 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-debrebase.7.pod:398 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:395 +#: ../dgit-maint-debrebase.7.pod:400 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I directory. You can also use tools like git-" @@ -719,19 +728,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:399 +#: ../dgit-maint-debrebase.7.pod:404 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:401 +#: ../dgit-maint-debrebase.7.pod:406 msgid "" "git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, " "re-order and delete patches. Run" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:406 ../dgit-maint-debrebase.7.pod:689 +#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714 #, no-wrap msgid "" " % git debrebase -i\n" @@ -739,19 +748,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:410 +#: ../dgit-maint-debrebase.7.pod:415 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:413 +#: ../dgit-maint-debrebase.7.pod:418 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:415 +#: ../dgit-maint-debrebase.7.pod:420 msgid "" "After completing the git rebase, your branch will not be a fast-forward of " "the git HEAD you had before the rebase. This means that we cannot push the " @@ -760,14 +769,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:421 +#: ../dgit-maint-debrebase.7.pod:426 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:426 +#: ../dgit-maint-debrebase.7.pod:431 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -775,7 +784,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:430 +#: ../dgit-maint-debrebase.7.pod:435 msgid "" "Note that each time you conclude a debrebase you introduce a pseudomerge " "into your git history, which may make it harder to read. Try to do all of " @@ -785,7 +794,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:438 +#: ../dgit-maint-debrebase.7.pod:443 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B, B or B or B. Remember to pass I<--new> " "if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:445 +#: ../dgit-maint-debrebase.7.pod:450 +msgid "" +"In some cases where you used B since the " +"last upload, it is not possible for dgit to make your history fast-" +"forwarding from the history on B. In such cases you will have " +"to pass I<--overwrite> to dgit. git-debrebase will normally tell you if " +"this is will be needed." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:456 msgid "" "Right before uploading, if you did not just already do so, you might want to " "have git-debrebase(1) shuffle your branch such that the Debian delta queue " @@ -808,7 +827,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:451 +#: ../dgit-maint-debrebase.7.pod:462 #, no-wrap msgid "" " % git debrebase\n" @@ -817,24 +836,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:456 +#: ../dgit-maint-debrebase.7.pod:467 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:458 +#: ../dgit-maint-debrebase.7.pod:469 msgid "" "After dgit pushing, be sure to git push to B, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:463 +#: ../dgit-maint-debrebase.7.pod:474 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:465 +#: ../dgit-maint-debrebase.7.pod:476 msgid "" "Here we explain how to handle material that is merely DFSG-non-free. " "Material which is legally dangerous (for example, files which are actually " @@ -842,7 +861,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:469 +#: ../dgit-maint-debrebase.7.pod:480 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -854,25 +873,26 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:475 +#: ../dgit-maint-debrebase.7.pod:486 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:477 +#: ../dgit-maint-debrebase.7.pod:488 msgid "" "Our approach is to maintain a DFSG-clean upstream branch, and create tags on " "this branch for each release that we want to import. We then import those " -"tags per \"Importing the release\", above." +"tags per \"Importing the release\", above. In the case of a new package, we " +"base our initial Debianisation on our first DFSG-clean tag." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:481 +#: ../dgit-maint-debrebase.7.pod:494 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:485 +#: ../dgit-maint-debrebase.7.pod:498 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -880,17 +900,38 @@ msgid "" " % git commit -m \"upstream version 1.2.3 DFSG-cleaned\"\n" " % git tag -s 1.2.3+dfsg\n" " % git checkout master\n" -" % # proceed with \"Importing the release\" on 1.2.3+dfsg tag\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:494 -msgid "And for subsequent releases (whether or not they require filtering):" +#: ../dgit-maint-debrebase.7.pod:506 +msgid "" +"Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or " +"in the case of a new package," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:498 +#: ../dgit-maint-debrebase.7.pod:511 +#, no-wrap +msgid "" +" % git branch --unset-upstream\n" +" % git reset --hard 1.2.3+dfsg\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:516 +msgid "and proceed with \"INITIAL DEBIANISATION\"." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:518 +msgid "" +"For subsequent releases (whether or not they require additional filtering):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:523 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -904,7 +945,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:508 +#: ../dgit-maint-debrebase.7.pod:533 msgid "" "Our upstream-dfsg branch cannot be pushed to B, but since we " "will need it whenever we import a new upstream version, we must push it " @@ -913,7 +954,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:515 +#: ../dgit-maint-debrebase.7.pod:540 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -921,17 +962,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:519 +#: ../dgit-maint-debrebase.7.pod:544 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:528 +#: ../dgit-maint-debrebase.7.pod:553 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:532 +#: ../dgit-maint-debrebase.7.pod:557 #, no-wrap msgid "" " % dgit fetch\n" @@ -940,7 +981,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:537 +#: ../dgit-maint-debrebase.7.pod:562 msgid "" "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 " @@ -948,7 +989,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:541 +#: ../dgit-maint-debrebase.7.pod:566 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I. Changes there would either cause trouble, or be " @@ -956,12 +997,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:545 +#: ../dgit-maint-debrebase.7.pod:570 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:549 +#: ../dgit-maint-debrebase.7.pod:574 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -969,14 +1010,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:578 msgid "" "If the NMUer added new commits modifying the upstream source, you will " "probably want to debrebase before your next upload to tidy those up." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:556 +#: ../dgit-maint-debrebase.7.pod:581 msgid "" "For example, the NMUer might have used git-revert(1) to unapply one of your " "patches. A debrebase can be used to strip both the patch and the reversion " @@ -984,12 +1025,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:560 +#: ../dgit-maint-debrebase.7.pod:585 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:562 +#: ../dgit-maint-debrebase.7.pod:587 msgid "" "If you cannot rebase because you have already pushed to B, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " @@ -997,24 +1038,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:567 +#: ../dgit-maint-debrebase.7.pod:592 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:569 +#: ../dgit-maint-debrebase.7.pod:594 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:571 +#: ../dgit-maint-debrebase.7.pod:596 msgid "" "Above we noted that each time you conclude a debrebase, you introduce a " "pseudomerge into your git history, which may make it harder to read." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:574 +#: ../dgit-maint-debrebase.7.pod:599 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B only right before you upload or push to B is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1047,7 +1088,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:593 +#: ../dgit-maint-debrebase.7.pod:618 msgid "" "I will often be out-of-date because git-debrebase(1) will " "only regenerate it when it needs to. So you should not rely on the " @@ -1057,17 +1098,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:599 +#: ../dgit-maint-debrebase.7.pod:624 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:601 +#: ../dgit-maint-debrebase.7.pod:626 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:603 +#: ../dgit-maint-debrebase.7.pod:628 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1076,7 +1117,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:609 +#: ../dgit-maint-debrebase.7.pod:634 msgid "" "The idea here is that from Debian's point of view, upstream releases are " "immutable points in history. We want to make sure that we are basing our " @@ -1085,19 +1126,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:615 +#: ../dgit-maint-debrebase.7.pod:640 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:618 +#: ../dgit-maint-debrebase.7.pod:643 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:620 +#: ../dgit-maint-debrebase.7.pod:645 msgid "" "If this is the first ever dgit push of the package, consider passing I<--" "deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " @@ -1107,12 +1148,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:626 +#: ../dgit-maint-debrebase.7.pod:651 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:628 +#: ../dgit-maint-debrebase.7.pod:653 msgid "" "The git history made by git-debrebase can seem complicated. Here are some " "suggestions for helpful invocations of gitk and git. They can be adapted " @@ -1120,12 +1161,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:632 +#: ../dgit-maint-debrebase.7.pod:657 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:636 +#: ../dgit-maint-debrebase.7.pod:661 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1133,17 +1174,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:638 +#: ../dgit-maint-debrebase.7.pod:663 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:642 +#: ../dgit-maint-debrebase.7.pod:667 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:644 +#: ../dgit-maint-debrebase.7.pod:669 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1151,12 +1192,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:646 +#: ../dgit-maint-debrebase.7.pod:671 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:648 +#: ../dgit-maint-debrebase.7.pod:673 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1164,12 +1205,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:650 +#: ../dgit-maint-debrebase.7.pod:675 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:654 +#: ../dgit-maint-debrebase.7.pod:679 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1177,7 +1218,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:656 +#: ../dgit-maint-debrebase.7.pod:681 msgid "" "The \"Declare fast forward\" commits you see have an older history (usually, " "an older delta queue) as one parent, and a newer history as the other. --" @@ -1185,12 +1226,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:688 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:667 +#: ../dgit-maint-debrebase.7.pod:692 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1198,17 +1239,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:694 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:673 +#: ../dgit-maint-debrebase.7.pod:698 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:700 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1217,12 +1258,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:678 +#: ../dgit-maint-debrebase.7.pod:703 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:680 +#: ../dgit-maint-debrebase.7.pod:705 #, no-wrap msgid "" " % git debrebase status\n" @@ -1230,24 +1271,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:682 +#: ../dgit-maint-debrebase.7.pod:707 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:684 +#: ../dgit-maint-debrebase.7.pod:709 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:693 +#: ../dgit-maint-debrebase.7.pod:718 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:697 +#: ../dgit-maint-debrebase.7.pod:722 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1255,7 +1296,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:702 +#: ../dgit-maint-debrebase.7.pod:727 msgid "" "A third alternative is to have git-debrebase(1) shuffle all the Debian " "changes to the end of your branch, and then manipulate them yourself using " @@ -1263,7 +1304,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:708 +#: ../dgit-maint-debrebase.7.pod:733 #, no-wrap msgid "" " % git debrebase\n" @@ -1272,7 +1313,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:713 +#: ../dgit-maint-debrebase.7.pod:738 msgid "" "If you take this approach, you should be very careful not to start the " "rebase too early, including before the most recent pseudomerge. git-rebase " @@ -1282,6 +1323,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:724 +#: ../dgit-maint-debrebase.7.pod:749 msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index ff4a730..97cbcd7 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: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-01-06 17:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -417,7 +417,7 @@ msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1168 +#: ../dgit.1:185 ../dgit.1:1192 msgid "Print a usage summary." msgstr "" @@ -955,7 +955,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:441 +#: ../dgit.1:496 ../git-debrebase.1.pod:462 #, no-wrap msgid "OPTIONS" msgstr "" @@ -1055,31 +1055,56 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:555 +#: ../dgit.1:548 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " -"build the source package or binaries from your working tree). Otherwise any " -"untracked files will be simply ignored. p.TP B<--clean=git-ff> | B<-wgf> " +"build the source package or binaries from your working tree). Otherwise it " +"will just check that there are no untracked unignored files. See --" +"clean=git[-ff],always, below." +msgstr "" + +#. type: TP +#: ../dgit.1:548 +#, no-wrap +msgid "B<--clean=git-ff> | B<-wgf>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:557 +msgid "" "Use B to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " "only unusual packages are likely to create)." msgstr "" #. type: TP -#: ../dgit.1:555 +#: ../dgit.1:557 #, no-wrap -msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" +msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text #: ../dgit.1:561 msgid "" +"Like --clean=git, but always does the clean and not just a check, deleting " +"any untracked un-ignored files." +msgstr "" + +#. type: TP +#: ../dgit.1:561 +#, no-wrap +msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:567 +msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:572 +#: ../dgit.1:578 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B in git status (ie, ones you " @@ -1087,13 +1112,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:572 +#: ../dgit.1:578 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:580 +#: ../dgit.1:586 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1102,13 +1127,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:580 +#: ../dgit.1:586 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:585 +#: ../dgit.1:591 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1116,12 +1141,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:589 +#: ../dgit.1:595 msgid "Without the extra B, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:599 +#: ../dgit.1:605 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1129,7 +1154,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:606 +#: ../dgit.1:612 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1138,7 +1163,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:616 +#: ../dgit.1:622 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1149,38 +1174,38 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:616 +#: ../dgit.1:622 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:620 +#: ../dgit.1:626 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:620 +#: ../dgit.1:626 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:625 +#: ../dgit.1:631 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:625 +#: ../dgit.1:631 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:631 +#: ../dgit.1:637 msgid "" "The package is or may be new in this suite. Without this, dgit will refuse " "to push. It may (for Debian, will) be unable to access the git history for " @@ -1188,13 +1213,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:631 +#: ../dgit.1:637 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:639 +#: ../dgit.1:645 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1204,24 +1229,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:639 +#: ../dgit.1:645 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:642 +#: ../dgit.1:648 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:642 +#: ../dgit.1:648 #, no-wrap msgid "B<--overwrite>[=I]" msgstr "" #. type: Plain text -#: ../dgit.1:653 +#: ../dgit.1:659 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:664 +#: ../dgit.1:670 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1245,14 +1270,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:670 +#: ../dgit.1:676 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See BI<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:684 +#: ../dgit.1:690 msgid "" "If I is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1263,7 +1288,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:690 +#: ../dgit.1:696 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1272,7 +1297,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:695 +#: ../dgit.1:701 msgid "" "(In quilt mode B, B or B, implying a split between the " "dgit view and the maintainer view, the pseudo-merge will appear only in the " @@ -1280,18 +1305,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:695 +#: ../dgit.1:701 #, no-wrap msgid "B<--delayed>=I" msgstr "" #. type: Plain text -#: ../dgit.1:698 +#: ../dgit.1:704 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:708 +#: ../dgit.1:714 msgid "" "B If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1301,27 +1326,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:713 +#: ../dgit.1:719 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:713 +#: ../dgit.1:719 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:725 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:729 +#: ../dgit.1:735 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1330,7 +1355,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:743 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1339,13 +1364,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:737 +#: ../dgit.1:743 #, no-wrap msgid "B<--save-dgit-view=>I|I" msgstr "" #. type: Plain text -#: ../dgit.1:747 +#: ../dgit.1:753 msgid "" "Specifies that when a split view quilt mode is in operation, and dgit " "calculates (or looks up in its cache) a dgit view corresponding to your " @@ -1354,7 +1379,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:754 +#: ../dgit.1:760 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective with --[quilt=]gbp, --" @@ -1362,25 +1387,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:758 +#: ../dgit.1:764 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:762 +#: ../dgit.1:768 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:762 +#: ../dgit.1:768 #, no-wrap msgid "B<--deliberately->I" msgstr "" #. type: Plain text -#: ../dgit.1:776 +#: ../dgit.1:782 msgid "" "Declare that you are deliberately doing I. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1392,13 +1417,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:776 +#: ../dgit.1:782 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:788 msgid "" "Declare that you are deliberately rewinding history. When pushing to " "Debian, use this when you are making a renewed upload of an entirely new " @@ -1407,7 +1432,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:793 +#: ../dgit.1:799 msgid "" "In split view quilt modes, this also prevents the construction by dgit of a " "pseudomerge to make the dgit view fast forwarding. Normally only one of --" @@ -1417,13 +1442,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:793 +#: ../dgit.1:799 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:802 +#: ../dgit.1:808 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1435,13 +1460,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:802 +#: ../dgit.1:808 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:807 +#: ../dgit.1:813 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1449,13 +1474,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:807 +#: ../dgit.1:813 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:814 +#: ../dgit.1:820 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1463,20 +1488,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:819 +#: ../dgit.1:825 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:819 +#: ../dgit.1:825 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:828 +#: ../dgit.1:834 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=auto) but if that doesn't seem " @@ -1486,13 +1511,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:828 +#: ../dgit.1:834 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:833 +#: ../dgit.1:839 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1500,7 +1525,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:845 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1509,13 +1534,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:839 +#: ../dgit.1:845 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:847 +#: ../dgit.1:853 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1524,13 +1549,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:847 +#: ../dgit.1:853 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../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, " @@ -1538,20 +1563,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:852 +#: ../dgit.1:858 #, no-wrap msgid "B<-->[B]B | B<-->[B]B | B<--quilt=unapplied>" msgstr "" #. type: Plain text -#: ../dgit.1:859 +#: ../dgit.1:865 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:867 +#: ../dgit.1:873 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1560,7 +1585,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:875 +#: ../dgit.1:881 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1568,7 +1593,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:880 +#: ../dgit.1:886 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1576,7 +1601,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:898 +#: ../dgit.1:904 msgid "" "With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " "and build) will automatically generate a conversion of your git branch into " @@ -1589,7 +1614,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:907 +#: ../dgit.1:913 msgid "" "B This is because it is not always possible to tell: a " @@ -1601,13 +1626,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:907 +#: ../dgit.1:913 #, no-wrap msgid "B<-d>I | B<--distro=>I" msgstr "" #. type: Plain text -#: ../dgit.1:916 +#: ../dgit.1:922 msgid "" "Specifies that the suite to be operated on is part of distro I. " "This overrides the default value found from the git config option BI" msgstr "" #. type: Plain text -#: ../dgit.1:932 +#: ../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 " @@ -1648,7 +1673,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:941 +#: ../dgit.1:947 msgid "" "If the specified I pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1656,13 +1681,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:941 +#: ../dgit.1:947 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:953 +#: ../dgit.1:959 msgid "" "When doing a build, delete any changes files matching " "IB<_>IB<_*.changes> before starting. This ensures that " @@ -1674,32 +1699,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:956 +#: ../dgit.1:962 msgid "" "Note that B will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:956 +#: ../dgit.1:962 #, no-wrap msgid "B<--build-products-dir=>I" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:966 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:963 +#: ../dgit.1:969 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:972 +#: ../dgit.1:978 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B" msgstr "" #. type: Plain text -#: ../dgit.1:975 +#: ../dgit.1:981 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:975 +#: ../dgit.1:981 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:982 +#: ../dgit.1:988 msgid "" "Generates a DEP-14 tag (eg BI) as well as a dgit tag (eg " "BI) where possible. This is the default." msgstr "" #. type: TP -#: ../dgit.1:982 +#: ../dgit.1:988 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:988 +#: ../dgit.1:994 msgid "" "Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " "where only the old tag format is supported, the dgit tag will have the " @@ -1746,52 +1771,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:988 +#: ../dgit.1:994 #, no-wrap msgid "B<--dep14tag-always>" msgstr "" #. type: Plain text -#: ../dgit.1:993 +#: ../dgit.1:999 msgid "" "Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " "not support that, dgit push will fail." msgstr "" #. type: TP -#: ../dgit.1:993 +#: ../dgit.1:999 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:997 +#: ../dgit.1:1003 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:997 +#: ../dgit.1:1003 #, no-wrap msgid "B<-c>IB<=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1001 +#: ../dgit.1:1007 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1001 +#: ../dgit.1:1007 #, no-wrap msgid "B<-v>I|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1010 +#: ../dgit.1:1016 msgid "" "Specifies the B<-v>I option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1801,7 +1826,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1022 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1809,30 +1834,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1016 +#: ../dgit.1:1022 #, no-wrap msgid "B<-m>I" msgstr "" #. type: Plain text -#: ../dgit.1:1019 +#: ../dgit.1:1025 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1019 +#: ../dgit.1:1025 #, no-wrap msgid "B<--ch:>I