chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11d3701
)
i18n-commit - autogenerated
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 6 Sep 2019 22:47:23 +0000
(23:47 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 6 Sep 2019 22:47:47 +0000
(23:47 +0100)
po/en_US.po
patch
|
blob
|
history
po/messages.pot
patch
|
blob
|
history
po/nl.po
patch
|
blob
|
history
po4a/dgit-maint-debrebase_7.pot
patch
|
blob
|
history
po4a/dgit-maint-merge_7.pot
patch
|
blob
|
history
po4a/dgit_1.pot
patch
|
blob
|
history
po4a/git-debrebase_5.pot
patch
|
blob
|
history
diff --git
a/po/en_US.po
b/po/en_US.po
index bd4bc79e16e0d58e8f5838c90e8e0d565cb1254a..cd157b5b1518154a1bce8f7539a8949483373abf 100644
(file)
--- 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"
msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-0
8-10 18:42
+0000\n"
+"POT-Creation-Date: 2019-0
9-06 22:47
+0000\n"
"PO-Revision-Date: 2018-08-26 16:55+0100\n"
"Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n"
"Language-Team: dgit developrs <dgit@packages.debian.org>\n"
"PO-Revision-Date: 2018-08-26 16:55+0100\n"
"Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n"
"Language-Team: dgit developrs <dgit@packages.debian.org>\n"
@@
-17,73
+17,73
@@
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:26
5
+#: ../dgit:26
7
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:27
2
+#: ../dgit:27
4
msgid "warning: overriding problem due to --force:\n"
msgstr ""
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:28
0
+#: ../dgit:28
2
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:28
5
+#: ../dgit:28
7
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:51
7
+#: ../dgit:51
9
#, perl-format
msgid "build host child %s"
msgstr ""
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:52
2 ../dgit:528
+#: ../dgit:52
4 ../dgit:530
#, perl-format
msgid "connection lost: %s"
msgstr ""
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:52
3
+#: ../dgit:52
5
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:53
1
+#: ../dgit:53
3
#, perl-format
msgid "eof (reading %s)"
msgstr ""
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:5
38
+#: ../dgit:5
40
msgid "protocol message"
msgstr ""
msgid "protocol message"
msgstr ""
-#: ../dgit:54
6
+#: ../dgit:54
8
#, perl-format
msgid "`%s'"
msgstr ""
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:56
7
+#: ../dgit:56
9
msgid "bad byte count"
msgstr ""
msgid "bad byte count"
msgstr ""
-#: ../dgit:57
0
+#: ../dgit:57
2
msgid "data block"
msgstr ""
msgid "data block"
msgstr ""
-#: ../dgit:6
49
+#: ../dgit:6
51
#, perl-format
msgid "%s ok: %s"
msgstr ""
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:65
1
+#: ../dgit:65
3
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:67
6
+#: ../dgit:67
8
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@
-104,147
+104,147
@@
msgid ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:69
5
+#: ../dgit:69
7
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:
699
+#: ../dgit:
701
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:70
4
+#: ../dgit:70
6
msgid "too few arguments"
msgstr ""
msgid "too few arguments"
msgstr ""
-#: ../dgit:82
0
+#: ../dgit:82
2
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:82
3
+#: ../dgit:82
5
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:84
3
+#: ../dgit:84
5
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:
884
+#: ../dgit:
902
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:
899
+#: ../dgit:
917
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:9
15
+#: ../dgit:9
33
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:9
35
+#: ../dgit:9
53
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:9
53
+#: ../dgit:9
71
#, perl-format
msgid "unknown %s `%s'"
msgstr ""
#, perl-format
msgid "unknown %s `%s'"
msgstr ""
-#: ../dgit:9
58 ../git-debrebase:1548 ../Debian/Dgit.pm:209
+#: ../dgit:9
76 ../git-debrebase:1548 ../Debian/Dgit.pm:211
msgid "internal error"
msgstr ""
msgid "internal error"
msgstr ""
-#: ../dgit:9
60
+#: ../dgit:9
78
msgid "pushing but distro is configured readonly"
msgstr ""
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:9
64
+#: ../dgit:9
82
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:
987
+#: ../dgit:
1005
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
-#: ../dgit:11
50
+#: ../dgit:11
68
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:12
17
+#: ../dgit:12
36
#, perl-format
msgid "fetch of %s failed (%s): %s"
msgstr ""
#, perl-format
msgid "fetch of %s failed (%s): %s"
msgstr ""
-#: ../dgit:12
24
+#: ../dgit:12
43
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:12
45
+#: ../dgit:12
64
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
-#: ../dgit:12
63
+#: ../dgit:12
82
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:12
67
+#: ../dgit:12
86
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:12
69
+#: ../dgit:12
88
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:12
71
+#: ../dgit:12
90
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:12
73 ../dgit:1298
+#: ../dgit:12
92 ../dgit:1317
msgid "bad ftpmaster api response: "
msgstr ""
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1
287
+#: ../dgit:1
306
#, perl-format
msgid "bad version: %s\n"
msgstr ""
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1
289
+#: ../dgit:1
308
msgid "bad component"
msgstr ""
msgid "bad component"
msgstr ""
-#: ../dgit:1
292
+#: ../dgit:1
311
msgid "bad filename"
msgstr ""
msgid "bad filename"
msgstr ""
-#: ../dgit:1
294
+#: ../dgit:1
313
msgid "bad sha256sum"
msgstr ""
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:13
45
+#: ../dgit:13
64
msgid "aptget archive query method takes no data part"
msgstr ""
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:14
29
+#: ../dgit:14
48
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@
-252,159
+252,159
@@
msgid ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:14
53
+#: ../dgit:14
72
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:14
79
+#: ../dgit:14
98
msgid "apt-get source did not produce a .dsc"
msgstr ""
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:14
80
+#: ../dgit:14
99
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1
585
+#: ../dgit:1
604
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
-#: ../dgit:17
24
+#: ../dgit:17
43
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:17
27
+#: ../dgit:17
46
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:17
29
+#: ../dgit:17
48
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:17
49
+#: ../dgit:17
68
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:17
55
+#: ../dgit:17
74
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1
782
+#: ../dgit:1
801
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:18
05
+#: ../dgit:18
24
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:18
20
+#: ../dgit:18
39
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:18
57
+#: ../dgit:18
76
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:19
03
+#: ../dgit:19
22
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:19
14
+#: ../dgit:19
33
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:19
60
+#: ../dgit:19
79
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:19
69
+#: ../dgit:19
88
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:19
73
+#: ../dgit:19
92
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:19
79
+#: ../dgit:19
98
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:20
19
+#: ../dgit:20
38
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:20
32
+#: ../dgit:20
51
msgid "cannot find section/priority from .changes Files field"
msgstr ""
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:20
45
+#: ../dgit:20
64
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:20
61
+#: ../dgit:20
80
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:20
66
+#: ../dgit:20
85
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:20
74
+#: ../dgit:20
93
#, perl-format
msgid "archive %s: %s"
msgstr ""
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2
081
+#: ../dgit:2
100
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:21
09
+#: ../dgit:21
28
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:21
17
+#: ../dgit:21
36
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:21
20
+#: ../dgit:21
39
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:21
39
+#: ../dgit:21
58
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:21
62
+#: ../dgit:21
81
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@
-419,108
+419,108
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:21
74
+#: ../dgit:21
93
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:22
05
+#: ../dgit:22
24
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:22
07
+#: ../dgit:22
26
msgid "(base) distro being accessed"
msgstr ""
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:22
09
+#: ../dgit:22
28
msgid "(nominal) distro being accessed"
msgstr ""
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:22
14
+#: ../dgit:22
33
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:22
39
+#: ../dgit:22
58
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:22
43
+#: ../dgit:22
62
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:22
45
+#: ../dgit:22
64
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:22
48
+#: ../dgit:22
67
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:22
57
+#: ../dgit:22
76
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:22
61
+#: ../dgit:22
80
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:22
64
+#: ../dgit:22
83
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:22
70
+#: ../dgit:22
89
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:23
41
+#: ../dgit:23
60
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:24
03
+#: ../dgit:24
22
msgid "package changelog"
msgstr ""
msgid "package changelog"
msgstr ""
-#: ../dgit:24
43
+#: ../dgit:24
62
msgid "package changelog has no entries!"
msgstr ""
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:25
12 ../dgit:2517
+#: ../dgit:25
31 ../dgit:2536
#, perl-format
msgid "accessing %s: %s"
msgstr ""
#, perl-format
msgid "accessing %s: %s"
msgstr ""
-#: ../dgit:25
32 ../dgit:2539
+#: ../dgit:25
51 ../dgit:2558
#, perl-format
msgid "saving %s: %s"
msgstr ""
#, perl-format
msgid "saving %s: %s"
msgstr ""
-#: ../dgit:25
65 ../dgit:6037
+#: ../dgit:25
84 ../dgit:6070
msgid "source package"
msgstr ""
msgid "source package"
msgstr ""
-#: ../dgit:26
43
+#: ../dgit:26
62
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:26
62
+#: ../dgit:26
81
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:26
71
+#: ../dgit:26
90
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@
-529,16
+529,16
@@
msgid ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2
686
+#: ../dgit:2
705
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2
690
+#: ../dgit:2
709
msgid "Import of source package"
msgstr ""
msgid "Import of source package"
msgstr ""
-#: ../dgit:27
10
+#: ../dgit:27
29
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-547,51
+547,51
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:27
52
+#: ../dgit:27
71
#, perl-format
msgid "using existing %s"
msgstr ""
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:27
56
+#: ../dgit:27
75
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:27
60
+#: ../dgit:27
79
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:27
76
+#: ../dgit:27
95
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:28
71
+#: ../dgit:28
90
msgid "too many iterations trying to get sane fetch!"
msgstr ""
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2
886
+#: ../dgit:2
905
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:29
30
+#: ../dgit:29
49
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:29
45
+#: ../dgit:29
64
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 ""
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:29
50
+#: ../dgit:29
69
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@
-601,24
+601,24
@@
msgid ""
"warning: Will try again...\n"
msgstr ""
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:3
097
+#: ../dgit:3
116
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:31
02
+#: ../dgit:31
21
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:31
07
+#: ../dgit:31
26
#, 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 ""
#, 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:31
17
+#: ../dgit:31
36
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@
-627,54
+627,54
@@
msgid ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:31
37
+#: ../dgit:31
56
msgid "rewrite map"
msgstr ""
msgid "rewrite map"
msgstr ""
-#: ../dgit:31
44
+#: ../dgit:31
63
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:31
48
+#: ../dgit:31
67
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:31
50
+#: ../dgit:31
69
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:31
57
+#: ../dgit:31
76
msgid "additional commits"
msgstr ""
msgid "additional commits"
msgstr ""
-#: ../dgit:31
60
+#: ../dgit:31
79
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3
185
+#: ../dgit:3
204
msgid "last upload to archive"
msgstr ""
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3
189
+#: ../dgit:3
208
msgid "no version available from the archive"
msgstr ""
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:32
72
+#: ../dgit:32
91
msgid "dgit suite branch on dgit git server"
msgstr ""
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:32
79
+#: ../dgit:32
98
msgid "dgit client's archive history view"
msgstr ""
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3
284
+#: ../dgit:3
303
msgid "Dgit field in .dsc from archive"
msgstr ""
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:33
12
+#: ../dgit:33
31
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-684,15
+684,15
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:33
25
+#: ../dgit:33
44
msgid "archive .dsc names newer git commit"
msgstr ""
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:33
28
+#: ../dgit:33
47
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:33
49
+#: ../dgit:33
68
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-700,7
+700,7
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:33
58
+#: ../dgit:33
77
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-710,7
+710,7
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:34
43
+#: ../dgit:34
62
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@
-718,19
+718,19
@@
msgid ""
"Record that\n"
msgstr ""
"Record that\n"
msgstr ""
-#: ../dgit:34
56
+#: ../dgit:34
75
msgid "should be treated as descended from\n"
msgstr ""
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:34
74
+#: ../dgit:34
93
msgid "dgit repo server tip (last push)"
msgstr ""
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:34
76
+#: ../dgit:34
95
msgid "local tracking tip (last fetch)"
msgstr ""
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3
487
+#: ../dgit:3
506
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-740,30
+740,30
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:35
02
+#: ../dgit:35
21
msgid "fetched source tree"
msgstr ""
msgid "fetched source tree"
msgstr ""
-#: ../dgit:35
38
+#: ../dgit:35
57
msgid "debian/changelog merge driver"
msgstr ""
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:36
03
+#: ../dgit:36
22
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:36
17
+#: ../dgit:36
36
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:36
32
+#: ../dgit:36
51
#, perl-format
msgid "install %s: %s"
msgstr ""
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:36
59
+#: ../dgit:36
78
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@
-771,30
+771,30
@@
msgid ""
"tree.\n"
msgstr ""
"tree.\n"
msgstr ""
-#: ../dgit:3
681
+#: ../dgit:3
700
#, perl-format
msgid "fetching %s..."
msgstr ""
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3
689
+#: ../dgit:3
708
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:37
28
+#: ../dgit:37
47
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:37
60
+#: ../dgit:37
79
msgid "local combined tracking branch"
msgstr ""
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:37
62
+#: ../dgit:37
81
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:38
01
+#: ../dgit:38
20
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@
-802,7
+802,7
@@
msgid ""
"Input branches:\n"
msgstr ""
"Input branches:\n"
msgstr ""
-#: ../dgit:38
15
+#: ../dgit:38
34
msgid ""
"\n"
"Key\n"
msgid ""
"\n"
"Key\n"
@@
-811,257
+811,257
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:38
30
+#: ../dgit:38
49
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:38
48
+#: ../dgit:38
67
#, perl-format
msgid "ready for work in %s"
msgstr ""
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:38
66
+#: ../dgit:38
85
msgid "dry run makes no sense with clone"
msgstr ""
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3
881
+#: ../dgit:3
900
#, perl-format
msgid "create `%s': %s"
msgstr ""
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3
893
+#: ../dgit:3
912
msgid "fetching existing git history"
msgstr ""
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3
896
+#: ../dgit:3
915
msgid "starting new git history"
msgstr ""
msgid "starting new git history"
msgstr ""
-#: ../dgit:39
21
+#: ../dgit:39
40
#, 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 ""
#, 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:39
26
+#: ../dgit:39
45
#, perl-format
msgid "fetched into %s"
msgstr ""
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:39
38
+#: ../dgit:39
57
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:39
40
+#: ../dgit:39
59
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:39
48
+#: ../dgit:39
67
#, perl-format
msgid "git tree contains %s"
msgstr ""
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:39
59
+#: ../dgit:39
78
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:39
78
+#: ../dgit:39
97
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
"HEAD commit%s differs from tree implied by debian/patches%s"
msgstr ""
#, 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:
3995
+#: ../dgit:
4014
msgid "nothing quilty to commit, ok."
msgstr ""
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:
3998
+#: ../dgit:
4017
msgid " (wanted to commit patch update)"
msgstr ""
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:40
02
+#: ../dgit:40
21
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:40
46
+#: ../dgit:40
65
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:40
51
+#: ../dgit:40
70
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:40
61
+#: ../dgit:40
80
#, perl-format
msgid "commit id %s"
msgstr ""
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:40
67
+#: ../dgit:40
86
#, perl-format
msgid "and left in %s"
msgstr ""
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4
093
+#: ../dgit:4
112
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4
096
+#: ../dgit:4
115
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:41
04
+#: ../dgit:41
23
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:41
13
+#: ../dgit:41
32
msgid "version currently in archive"
msgstr ""
msgid "version currently in archive"
msgstr ""
-#: ../dgit:41
22
+#: ../dgit:41
41
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:41
30
+#: ../dgit:41
49
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:41
41
+#: ../dgit:41
60
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:41
44
+#: ../dgit:41
63
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:41
58
+#: ../dgit:41
77
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:42
14
+#: ../dgit:42
33
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:42
23
+#: ../dgit:42
42
msgid "maintainer view tag"
msgstr ""
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:42
25
+#: ../dgit:42
44
msgid "dgit view tag"
msgstr ""
msgid "dgit view tag"
msgstr ""
-#: ../dgit:42
26
+#: ../dgit:42
45
msgid "current archive contents"
msgstr ""
msgid "current archive contents"
msgstr ""
-#: ../dgit:42
39
+#: ../dgit:42
58
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:42
49
+#: ../dgit:42
68
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:42
50
+#: ../dgit:42
69
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:42
54
+#: ../dgit:42
73
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:42
67
+#: ../dgit:42
86
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:42
75
+#: ../dgit:42
94
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4
287
+#: ../dgit:4
306
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:43
09
+#: ../dgit:43
28
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:43
63
+#: ../dgit:43
82
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:56
09
+#: ../dgit:56
42
msgid "maximum search space exceeded"
msgstr ""
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:56
27
+#: ../dgit:56
60
#, perl-format
msgid "has %s not %s"
msgstr ""
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:56
36
+#: ../dgit:56
69
msgid "root commit"
msgstr ""
msgid "root commit"
msgstr ""
-#: ../dgit:56
42
+#: ../dgit:56
75
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:56
54
+#: ../dgit:56
87
#, perl-format
msgid "changed %s"
msgstr ""
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5
673
+#: ../dgit:5
706
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5
680
+#: ../dgit:5
713
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5
692
+#: ../dgit:5
725
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5
695
+#: ../dgit:5
728
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:57
07
+#: ../dgit:57
40
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@
-1069,84
+1069,84
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:57
14
+#: ../dgit:57
47
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:57
48
+#: ../dgit:57
81
msgid "contains unexpected slashes\n"
msgstr ""
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:57
49
+#: ../dgit:57
82
msgid "contains leading punctuation\n"
msgstr ""
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:57
50
+#: ../dgit:57
83
msgid "contains bad character(s)\n"
msgstr ""
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:57
51
+#: ../dgit:57
84
msgid "is series file\n"
msgstr ""
msgid "is series file\n"
msgstr ""
-#: ../dgit:57
52
+#: ../dgit:57
85
msgid "too long\n"
msgstr ""
msgid "too long\n"
msgstr ""
-#: ../dgit:57
56
+#: ../dgit:57
89
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5
785
+#: ../dgit:5
818
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5
868
+#: ../dgit:5
901
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
-#: ../dgit:5
886
+#: ../dgit:5
919
msgid "converted"
msgstr ""
msgid "converted"
msgstr ""
-#: ../dgit:5
887
+#: ../dgit:5
920
#, perl-format
msgid "dgit view: created (%s)"
msgstr ""
#, perl-format
msgid "dgit view: created (%s)"
msgstr ""
-#: ../dgit:59
41
+#: ../dgit:59
74
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:59
51
+#: ../dgit:59
84
msgid "starting quiltify (single-debian-patch)"
msgstr ""
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:60
61
+#: ../dgit:60
94
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6
093
+#: ../dgit:6
126
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6
098
+#: ../dgit:6
131
msgid "dgit view: found cached, no changes required"
msgstr ""
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:61
33
+#: ../dgit:61
66
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:62
47
+#: ../dgit:62
80
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"
msgid ""
"failed to apply your git tree's patch stack (from debian/patches/) to\n"
" the corresponding upstream tarball(s). Your source tree and .orig\n"
@@
-1154,84
+1154,84
@@
msgid ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:62
61
+#: ../dgit:62
94
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6
295
+#: ../dgit:6
328
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
-#: ../dgit:63
08
+#: ../dgit:63
41
msgid "tarball"
msgstr ""
msgid "tarball"
msgstr ""
-#: ../dgit:63
26
+#: ../dgit:63
59
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
-#: ../dgit:63
42
+#: ../dgit:63
75
msgid "tarballs"
msgstr ""
msgid "tarballs"
msgstr ""
-#: ../dgit:63
56
+#: ../dgit:63
89
msgid "upstream"
msgstr ""
msgid "upstream"
msgstr ""
-#: ../dgit:6
380
+#: ../dgit:6
413
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6
390
+#: ../dgit:6
423
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6
399
+#: ../dgit:6
432
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:64
03
+#: ../dgit:64
36
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:64
10
+#: ../dgit:64
43
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
-#: ../dgit:64
14
+#: ../dgit:64
47
msgid "This might be a patches-unapplied branch."
msgstr ""
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:64
17
+#: ../dgit:64
50
msgid "This might be a patches-applied branch."
msgstr ""
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:64
20
+#: ../dgit:64
53
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:64
23
+#: ../dgit:64
56
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:64
27
+#: ../dgit:64
60
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:64
38
+#: ../dgit:64
71
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6
477
+#: ../dgit:6
510
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@
-1240,124
+1240,137
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:6
489
+#: ../dgit:6
522
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:65
18
+#: ../dgit:65
51
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
-#: ../dgit:65
30
+#: ../dgit:65
63
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:65
33
+#: ../dgit:65
66
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:65
36
+#: ../dgit:65
69
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:65
49
+#: ../dgit:65
82
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
-#: ../dgit:65
66
+#: ../dgit:65
99
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6
580
+#: ../dgit:6
613
msgid "clean takes no additional arguments"
msgstr ""
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6
599
+#: ../dgit:6
632
#, perl-format
msgid "-p specified package %s, but changelog says %s"
msgstr ""
#, perl-format
msgid "-p specified package %s, but changelog says %s"
msgstr ""
-#: ../dgit:66
09
+#: ../dgit:66
42
msgid ""
"dgit: --include-dirty is not supported with split view (including with view-"
"splitting quilt modes)"
msgstr ""
msgid ""
"dgit: --include-dirty is not supported with split view (including with view-"
"splitting quilt modes)"
msgstr ""
-#: ../dgit:66
18
+#: ../dgit:66
51
#, perl-format
msgid "dgit: --quilt=%s, %s"
msgstr ""
#, perl-format
msgid "dgit: --quilt=%s, %s"
msgstr ""
-#: ../dgit:66
22
+#: ../dgit:66
55
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
-#: ../dgit:66
57
+#: ../dgit:66
90
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:66
59
+#: ../dgit:66
92
#, perl-format
msgid "would remove %s"
msgstr ""
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6685
+#: ../dgit:6710
+#, perl-format
+msgid "warning: dgit option %s must be passed before %s on dgit command line\n"
+msgstr ""
+
+#: ../dgit:6717
+#, perl-format
+msgid ""
+"warning: option %s should probably be passed to dgit before %s sub-command "
+"on the dgit command line, so that it is seen by dgit and not simply passed "
+"to %s\n"
+msgstr ""
+
+#: ../dgit:6743
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6
691
+#: ../dgit:6
749
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6
694
+#: ../dgit:6
752
msgid "package seems new, not specifying -v<version>"
msgstr ""
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:67
37
+#: ../dgit:67
95
msgid "Wanted to build nothing!"
msgstr ""
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6
775
+#: ../dgit:6
833
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6
782
+#: ../dgit:6
840
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6
789
+#: ../dgit:6
847
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6
793
+#: ../dgit:6
851
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6
798
+#: ../dgit:6
856
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:68
01
+#: ../dgit:68
59
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:68
14
+#: ../dgit:68
72
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@
-1365,136
+1378,136
@@
msgid ""
"Suggest you delete %s.\n"
msgstr ""
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:68
32
+#: ../dgit:68
90
msgid "build successful\n"
msgstr ""
msgid "build successful\n"
msgstr ""
-#: ../dgit:68
39
+#: ../dgit:68
98
#, 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 ""
#, 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:
694
9
+#: ../dgit:
700
9
#, perl-format
msgid "remove %s: %s"
msgstr ""
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:
698
6
+#: ../dgit:
704
6
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:70
0
6
+#: ../dgit:70
6
6
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:70
1
9
+#: ../dgit:70
7
9
msgid "build-source takes no additional arguments"
msgstr ""
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:70
2
3
+#: ../dgit:70
8
3
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:70
3
0
+#: ../dgit:70
9
0
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:70
3
6
+#: ../dgit:70
9
6
msgid "source changes file"
msgstr ""
msgid "source changes file"
msgstr ""
-#: ../dgit:70
3
8
+#: ../dgit:70
9
8
msgid "user-specified changes file is not source-only"
msgstr ""
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:7
058 ../dgit:706
0
+#: ../dgit:7
118 ../dgit:712
0
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:7
073
+#: ../dgit:7
134
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 ""
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:7
085
+#: ../dgit:7
147
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:7
089
+#: ../dgit:7
151
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
msgstr ""
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:71
19
+#: ../dgit:71
81
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:7
140
+#: ../dgit:7
202
msgid "source tree"
msgstr ""
msgid "source tree"
msgstr ""
-#: ../dgit:7
142
+#: ../dgit:7
204
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:7
155
+#: ../dgit:7
217
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:7
159
+#: ../dgit:7
221
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:7
163
+#: ../dgit:7
225
msgid "dry run makes no sense with import-dsc"
msgstr ""
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:7
180
+#: ../dgit:7
242
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:7
185
+#: ../dgit:7
247
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:7
187
+#: ../dgit:7
249
#, perl-format
msgid "read %s: %s"
msgstr ""
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:7
198
+#: ../dgit:7
260
msgid "import-dsc signature check failed"
msgstr ""
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:72
01
+#: ../dgit:72
63
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:72
12
+#: ../dgit:72
74
msgid "Dgit metadata in .dsc"
msgstr ""
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:72
23
+#: ../dgit:72
85
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:72
32
+#: ../dgit:72
94
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@
-1502,21
+1515,21
@@
msgid ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:7
239
+#: ../dgit:7
301
msgid "Not fast forward, forced update."
msgstr ""
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:7
241
+#: ../dgit:7
303
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:7
246
+#: ../dgit:7
308
#, perl-format
msgid "updated git ref %s"
msgstr ""
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7
251
+#: ../dgit:7
313
#, perl-format
msgid ""
"Branch %s already exists\n"
#, perl-format
msgid ""
"Branch %s already exists\n"
@@
-1524,129
+1537,129
@@
msgid ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7
271
+#: ../dgit:7
333
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7
273
+#: ../dgit:7
335
#, perl-format
msgid "stat %s: %s"
msgstr ""
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7
281
+#: ../dgit:7
343
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:73
00
+#: ../dgit:73
62
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:73
04
+#: ../dgit:73
66
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:73
05
+#: ../dgit:73
67
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:73
16
+#: ../dgit:73
78
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:73
18
+#: ../dgit:73
80
msgid "Import, merging."
msgstr ""
msgid "Import, merging."
msgstr ""
-#: ../dgit:73
32
+#: ../dgit:73
94
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7
341
+#: ../dgit:7
403
#, perl-format
msgid "results are in git ref %s"
msgstr ""
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7
348
+#: ../dgit:7
410
msgid "need only 1 subpath argument"
msgstr ""
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7
366
+#: ../dgit:7
428
msgid "need destination argument"
msgstr ""
msgid "need destination argument"
msgstr ""
-#: ../dgit:7
371
+#: ../dgit:7
433
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7
379
+#: ../dgit:7
441
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7
390
+#: ../dgit:7
452
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7
396
+#: ../dgit:7
458
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:74
03 ../dgit:7409
+#: ../dgit:74
65 ../dgit:7471
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:74
15
+#: ../dgit:74
77
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7
462
+#: ../dgit:7
524
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:75
01
+#: ../dgit:75
63
#, perl-format
msgid "%s needs a value"
msgstr ""
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:75
05
+#: ../dgit:75
67
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:76
05
+#: ../dgit:76
67
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:76
23
+#: ../dgit:76
85
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7
678
+#: ../dgit:7
740
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7
693
+#: ../dgit:7
755
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7
697
+#: ../dgit:7
759
#, perl-format
msgid "%s is blocked\n"
msgstr ""
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:77
03
+#: ../dgit:77
65
#, perl-format
msgid ""
"On entry to dgit, %s\n"
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@
-1654,35
+1667,35
@@
msgid ""
"Giving up.\n"
msgstr ""
"Giving up.\n"
msgstr ""
-#: ../dgit:77
20
+#: ../dgit:77
82
#, perl-format
msgid "cannot set command for %s"
msgstr ""
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:77
33
+#: ../dgit:77
95
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7
753
+#: ../dgit:7
815
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7
764
+#: ../dgit:7
826
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7
792
+#: ../dgit:7
854
msgid "DRY RUN ONLY\n"
msgstr ""
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7
793
+#: ../dgit:7
855
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:78
12
+#: ../dgit:78
74
#, perl-format
msgid "unknown operation %s"
msgstr ""
#, perl-format
msgid "unknown operation %s"
msgstr ""
@@
-2364,93
+2377,93
@@
msgstr ""
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:29
6
+#: ../Debian/Dgit.pm:29
8
#, perl-format
msgid "error: %s\n"
msgstr ""
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:32
2
+#: ../Debian/Dgit.pm:32
4
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:34
1
+#: ../Debian/Dgit.pm:34
3
msgid "terminated, reporting successful completion"
msgstr ""
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:34
3
+#: ../Debian/Dgit.pm:34
5
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:34
6
+#: ../Debian/Dgit.pm:34
8
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:35
0
+#: ../Debian/Dgit.pm:35
2
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:35
6
+#: ../Debian/Dgit.pm:35
8
msgid "failed command"
msgstr ""
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:36
2
+#: ../Debian/Dgit.pm:36
4
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:36
4
+#: ../Debian/Dgit.pm:36
6
#, perl-format
msgid "subprocess %s"
msgstr ""
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:36
6
+#: ../Debian/Dgit.pm:36
8
msgid "subprocess produced invalid output"
msgstr ""
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:45
7
+#: ../Debian/Dgit.pm:45
9
msgid "stat source file: %S"
msgstr ""
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:46
7
+#: ../Debian/Dgit.pm:46
9
msgid "stat destination file: %S"
msgstr ""
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:48
6
+#: ../Debian/Dgit.pm:48
8
msgid "finally install file after cp: %S"
msgstr ""
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:49
2
+#: ../Debian/Dgit.pm:49
4
msgid "delete old file after cp: %S"
msgstr ""
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:51
3
+#: ../Debian/Dgit.pm:51
5
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:51
6
+#: ../Debian/Dgit.pm:51
8
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:62
4
+#: ../Debian/Dgit.pm:62
6
msgid "git index contains changes (does not match HEAD)"
msgstr ""
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:62
5
+#: ../Debian/Dgit.pm:62
7
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:64
7
+#: ../Debian/Dgit.pm:64
9
msgid "using specified upstream commitish"
msgstr ""
msgid "using specified upstream commitish"
msgstr ""
-#: ../Debian/Dgit.pm:65
3
+#: ../Debian/Dgit.pm:65
5
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
@@
-2458,66
+2471,66
@@
msgid ""
" Check version, and specify upstream commitish explicitly."
msgstr ""
" Check version, and specify upstream commitish explicitly."
msgstr ""
-#: ../Debian/Dgit.pm:6
59 ../Debian/Dgit.pm:661
+#: ../Debian/Dgit.pm:6
61 ../Debian/Dgit.pm:663
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
-#: ../Debian/Dgit.pm:76
7
+#: ../Debian/Dgit.pm:76
9
msgid "detached HEAD"
msgstr ""
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:7
68
+#: ../Debian/Dgit.pm:7
70
msgid "HEAD symref is not to refs/"
msgstr ""
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:78
4
+#: ../Debian/Dgit.pm:78
6
#, perl-format
msgid "parsing of %s failed"
msgstr ""
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:79
3
+#: ../Debian/Dgit.pm:79
5
#, 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 ""
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"modify the .dsc and then do the signature itself"
msgstr ""
-#: ../Debian/Dgit.pm:80
7
+#: ../Debian/Dgit.pm:80
9
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:8
28
+#: ../Debian/Dgit.pm:8
30
#, perl-format
msgid "missing field %s in %s"
msgstr ""
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:91
4
+#: ../Debian/Dgit.pm:91
6
msgid "Dummy commit - do not use\n"
msgstr ""
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:93
5
+#: ../Debian/Dgit.pm:93
7
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:100
3
+#: ../Debian/Dgit.pm:100
5
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:102
6
+#: ../Debian/Dgit.pm:102
8
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:103
4
+#: ../Debian/Dgit.pm:103
6
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:104
3
+#: ../Debian/Dgit.pm:104
5
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
diff --git
a/po/messages.pot
b/po/messages.pot
index ee453dfad65420ab8d071ba4d7e6ed7da35453c0..20337c882af1b5908a2eceb28dc540bc474482de 100644
(file)
--- 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"
msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-0
8-10 18:42
+0000\n"
+"POT-Creation-Date: 2019-0
9-06 22:47
+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-17,73
+17,73
@@
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:26
5
+#: ../dgit:26
7
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:27
2
+#: ../dgit:27
4
msgid "warning: overriding problem due to --force:\n"
msgstr ""
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:28
0
+#: ../dgit:28
2
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:28
5
+#: ../dgit:28
7
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:51
7
+#: ../dgit:51
9
#, perl-format
msgid "build host child %s"
msgstr ""
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:52
2 ../dgit:528
+#: ../dgit:52
4 ../dgit:530
#, perl-format
msgid "connection lost: %s"
msgstr ""
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:52
3
+#: ../dgit:52
5
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:53
1
+#: ../dgit:53
3
#, perl-format
msgid "eof (reading %s)"
msgstr ""
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:5
38
+#: ../dgit:5
40
msgid "protocol message"
msgstr ""
msgid "protocol message"
msgstr ""
-#: ../dgit:54
6
+#: ../dgit:54
8
#, perl-format
msgid "`%s'"
msgstr ""
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:56
7
+#: ../dgit:56
9
msgid "bad byte count"
msgstr ""
msgid "bad byte count"
msgstr ""
-#: ../dgit:57
0
+#: ../dgit:57
2
msgid "data block"
msgstr ""
msgid "data block"
msgstr ""
-#: ../dgit:6
49
+#: ../dgit:6
51
#, perl-format
msgid "%s ok: %s"
msgstr ""
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:65
1
+#: ../dgit:65
3
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:67
6
+#: ../dgit:67
8
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@
-104,147
+104,147
@@
msgid ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:69
5
+#: ../dgit:69
7
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:
699
+#: ../dgit:
701
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:70
4
+#: ../dgit:70
6
msgid "too few arguments"
msgstr ""
msgid "too few arguments"
msgstr ""
-#: ../dgit:82
0
+#: ../dgit:82
2
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:82
3
+#: ../dgit:82
5
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:84
3
+#: ../dgit:84
5
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:
884
+#: ../dgit:
902
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:
899
+#: ../dgit:
917
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:9
15
+#: ../dgit:9
33
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:9
35
+#: ../dgit:9
53
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:9
53
+#: ../dgit:9
71
#, perl-format
msgid "unknown %s `%s'"
msgstr ""
#, perl-format
msgid "unknown %s `%s'"
msgstr ""
-#: ../dgit:9
58 ../git-debrebase:1548 ../Debian/Dgit.pm:209
+#: ../dgit:9
76 ../git-debrebase:1548 ../Debian/Dgit.pm:211
msgid "internal error"
msgstr ""
msgid "internal error"
msgstr ""
-#: ../dgit:9
60
+#: ../dgit:9
78
msgid "pushing but distro is configured readonly"
msgstr ""
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:9
64
+#: ../dgit:9
82
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:
987
+#: ../dgit:
1005
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
-#: ../dgit:11
50
+#: ../dgit:11
68
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:12
17
+#: ../dgit:12
36
#, perl-format
msgid "fetch of %s failed (%s): %s"
msgstr ""
#, perl-format
msgid "fetch of %s failed (%s): %s"
msgstr ""
-#: ../dgit:12
24
+#: ../dgit:12
43
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:12
45
+#: ../dgit:12
64
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
-#: ../dgit:12
63
+#: ../dgit:12
82
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:12
67
+#: ../dgit:12
86
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:12
69
+#: ../dgit:12
88
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:12
71
+#: ../dgit:12
90
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:12
73 ../dgit:1298
+#: ../dgit:12
92 ../dgit:1317
msgid "bad ftpmaster api response: "
msgstr ""
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1
287
+#: ../dgit:1
306
#, perl-format
msgid "bad version: %s\n"
msgstr ""
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1
289
+#: ../dgit:1
308
msgid "bad component"
msgstr ""
msgid "bad component"
msgstr ""
-#: ../dgit:1
292
+#: ../dgit:1
311
msgid "bad filename"
msgstr ""
msgid "bad filename"
msgstr ""
-#: ../dgit:1
294
+#: ../dgit:1
313
msgid "bad sha256sum"
msgstr ""
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:13
45
+#: ../dgit:13
64
msgid "aptget archive query method takes no data part"
msgstr ""
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:14
29
+#: ../dgit:14
48
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@
-252,159
+252,159
@@
msgid ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:14
53
+#: ../dgit:14
72
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:14
79
+#: ../dgit:14
98
msgid "apt-get source did not produce a .dsc"
msgstr ""
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:14
80
+#: ../dgit:14
99
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1
585
+#: ../dgit:1
604
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
-#: ../dgit:17
24
+#: ../dgit:17
43
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:17
27
+#: ../dgit:17
46
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:17
29
+#: ../dgit:17
48
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:17
49
+#: ../dgit:17
68
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:17
55
+#: ../dgit:17
74
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1
782
+#: ../dgit:1
801
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:18
05
+#: ../dgit:18
24
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:18
20
+#: ../dgit:18
39
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:18
57
+#: ../dgit:18
76
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:19
03
+#: ../dgit:19
22
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:19
14
+#: ../dgit:19
33
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:19
60
+#: ../dgit:19
79
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:19
69
+#: ../dgit:19
88
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:19
73
+#: ../dgit:19
92
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:19
79
+#: ../dgit:19
98
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:20
19
+#: ../dgit:20
38
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:20
32
+#: ../dgit:20
51
msgid "cannot find section/priority from .changes Files field"
msgstr ""
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:20
45
+#: ../dgit:20
64
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:20
61
+#: ../dgit:20
80
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:20
66
+#: ../dgit:20
85
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:20
74
+#: ../dgit:20
93
#, perl-format
msgid "archive %s: %s"
msgstr ""
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2
081
+#: ../dgit:2
100
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:21
09
+#: ../dgit:21
28
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:21
17
+#: ../dgit:21
36
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:21
20
+#: ../dgit:21
39
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:21
39
+#: ../dgit:21
58
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:21
62
+#: ../dgit:21
81
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@
-419,108
+419,108
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:21
74
+#: ../dgit:21
93
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:22
05
+#: ../dgit:22
24
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:22
07
+#: ../dgit:22
26
msgid "(base) distro being accessed"
msgstr ""
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:22
09
+#: ../dgit:22
28
msgid "(nominal) distro being accessed"
msgstr ""
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:22
14
+#: ../dgit:22
33
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:22
39
+#: ../dgit:22
58
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:22
43
+#: ../dgit:22
62
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:22
45
+#: ../dgit:22
64
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:22
48
+#: ../dgit:22
67
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:22
57
+#: ../dgit:22
76
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:22
61
+#: ../dgit:22
80
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:22
64
+#: ../dgit:22
83
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:22
70
+#: ../dgit:22
89
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:23
41
+#: ../dgit:23
60
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:24
03
+#: ../dgit:24
22
msgid "package changelog"
msgstr ""
msgid "package changelog"
msgstr ""
-#: ../dgit:24
43
+#: ../dgit:24
62
msgid "package changelog has no entries!"
msgstr ""
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:25
12 ../dgit:2517
+#: ../dgit:25
31 ../dgit:2536
#, perl-format
msgid "accessing %s: %s"
msgstr ""
#, perl-format
msgid "accessing %s: %s"
msgstr ""
-#: ../dgit:25
32 ../dgit:2539
+#: ../dgit:25
51 ../dgit:2558
#, perl-format
msgid "saving %s: %s"
msgstr ""
#, perl-format
msgid "saving %s: %s"
msgstr ""
-#: ../dgit:25
65 ../dgit:6037
+#: ../dgit:25
84 ../dgit:6070
msgid "source package"
msgstr ""
msgid "source package"
msgstr ""
-#: ../dgit:26
43
+#: ../dgit:26
62
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:26
62
+#: ../dgit:26
81
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:26
71
+#: ../dgit:26
90
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@
-529,16
+529,16
@@
msgid ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2
686
+#: ../dgit:2
705
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2
690
+#: ../dgit:2
709
msgid "Import of source package"
msgstr ""
msgid "Import of source package"
msgstr ""
-#: ../dgit:27
10
+#: ../dgit:27
29
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-547,51
+547,51
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:27
52
+#: ../dgit:27
71
#, perl-format
msgid "using existing %s"
msgstr ""
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:27
56
+#: ../dgit:27
75
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:27
60
+#: ../dgit:27
79
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:27
76
+#: ../dgit:27
95
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:28
71
+#: ../dgit:28
90
msgid "too many iterations trying to get sane fetch!"
msgstr ""
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2
886
+#: ../dgit:2
905
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:29
30
+#: ../dgit:29
49
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:29
45
+#: ../dgit:29
64
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 ""
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:29
50
+#: ../dgit:29
69
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@
-601,24
+601,24
@@
msgid ""
"warning: Will try again...\n"
msgstr ""
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:3
097
+#: ../dgit:3
116
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:31
02
+#: ../dgit:31
21
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:31
07
+#: ../dgit:31
26
#, 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 ""
#, 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:31
17
+#: ../dgit:31
36
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@
-627,54
+627,54
@@
msgid ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:31
37
+#: ../dgit:31
56
msgid "rewrite map"
msgstr ""
msgid "rewrite map"
msgstr ""
-#: ../dgit:31
44
+#: ../dgit:31
63
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:31
48
+#: ../dgit:31
67
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:31
50
+#: ../dgit:31
69
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:31
57
+#: ../dgit:31
76
msgid "additional commits"
msgstr ""
msgid "additional commits"
msgstr ""
-#: ../dgit:31
60
+#: ../dgit:31
79
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3
185
+#: ../dgit:3
204
msgid "last upload to archive"
msgstr ""
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3
189
+#: ../dgit:3
208
msgid "no version available from the archive"
msgstr ""
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:32
72
+#: ../dgit:32
91
msgid "dgit suite branch on dgit git server"
msgstr ""
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:32
79
+#: ../dgit:32
98
msgid "dgit client's archive history view"
msgstr ""
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3
284
+#: ../dgit:3
303
msgid "Dgit field in .dsc from archive"
msgstr ""
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:33
12
+#: ../dgit:33
31
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-684,15
+684,15
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:33
25
+#: ../dgit:33
44
msgid "archive .dsc names newer git commit"
msgstr ""
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:33
28
+#: ../dgit:33
47
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:33
49
+#: ../dgit:33
68
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-700,7
+700,7
@@
msgid ""
"%s\n"
msgstr ""
"%s\n"
msgstr ""
-#: ../dgit:33
58
+#: ../dgit:33
77
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-710,7
+710,7
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:34
43
+#: ../dgit:34
62
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@
-718,19
+718,19
@@
msgid ""
"Record that\n"
msgstr ""
"Record that\n"
msgstr ""
-#: ../dgit:34
56
+#: ../dgit:34
75
msgid "should be treated as descended from\n"
msgstr ""
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:34
74
+#: ../dgit:34
93
msgid "dgit repo server tip (last push)"
msgstr ""
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:34
76
+#: ../dgit:34
95
msgid "local tracking tip (last fetch)"
msgstr ""
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3
487
+#: ../dgit:3
506
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-740,30
+740,30
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:35
02
+#: ../dgit:35
21
msgid "fetched source tree"
msgstr ""
msgid "fetched source tree"
msgstr ""
-#: ../dgit:35
38
+#: ../dgit:35
57
msgid "debian/changelog merge driver"
msgstr ""
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:36
03
+#: ../dgit:36
22
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:36
17
+#: ../dgit:36
36
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:36
32
+#: ../dgit:36
51
#, perl-format
msgid "install %s: %s"
msgstr ""
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:36
59
+#: ../dgit:36
78
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@
-771,30
+771,30
@@
msgid ""
"tree.\n"
msgstr ""
"tree.\n"
msgstr ""
-#: ../dgit:3
681
+#: ../dgit:3
700
#, perl-format
msgid "fetching %s..."
msgstr ""
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3
689
+#: ../dgit:3
708
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:37
28
+#: ../dgit:37
47
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:37
60
+#: ../dgit:37
79
msgid "local combined tracking branch"
msgstr ""
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:37
62
+#: ../dgit:37
81
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:38
01
+#: ../dgit:38
20
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@
-802,7
+802,7
@@
msgid ""
"Input branches:\n"
msgstr ""
"Input branches:\n"
msgstr ""
-#: ../dgit:38
15
+#: ../dgit:38
34
msgid ""
"\n"
"Key\n"
msgid ""
"\n"
"Key\n"
@@
-811,257
+811,257
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:38
30
+#: ../dgit:38
49
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:38
48
+#: ../dgit:38
67
#, perl-format
msgid "ready for work in %s"
msgstr ""
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:38
66
+#: ../dgit:38
85
msgid "dry run makes no sense with clone"
msgstr ""
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3
881
+#: ../dgit:3
900
#, perl-format
msgid "create `%s': %s"
msgstr ""
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3
893
+#: ../dgit:3
912
msgid "fetching existing git history"
msgstr ""
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3
896
+#: ../dgit:3
915
msgid "starting new git history"
msgstr ""
msgid "starting new git history"
msgstr ""
-#: ../dgit:39
21
+#: ../dgit:39
40
#, 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 ""
#, 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:39
26
+#: ../dgit:39
45
#, perl-format
msgid "fetched into %s"
msgstr ""
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:39
38
+#: ../dgit:39
57
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:39
40
+#: ../dgit:39
59
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:39
48
+#: ../dgit:39
67
#, perl-format
msgid "git tree contains %s"
msgstr ""
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:39
59
+#: ../dgit:39
78
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:39
78
+#: ../dgit:39
97
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
"HEAD commit%s differs from tree implied by debian/patches%s"
msgstr ""
#, 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:
3995
+#: ../dgit:
4014
msgid "nothing quilty to commit, ok."
msgstr ""
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:
3998
+#: ../dgit:
4017
msgid " (wanted to commit patch update)"
msgstr ""
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:40
02
+#: ../dgit:40
21
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:40
46
+#: ../dgit:40
65
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:40
51
+#: ../dgit:40
70
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:40
61
+#: ../dgit:40
80
#, perl-format
msgid "commit id %s"
msgstr ""
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:40
67
+#: ../dgit:40
86
#, perl-format
msgid "and left in %s"
msgstr ""
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4
093
+#: ../dgit:4
112
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4
096
+#: ../dgit:4
115
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:41
04
+#: ../dgit:41
23
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:41
13
+#: ../dgit:41
32
msgid "version currently in archive"
msgstr ""
msgid "version currently in archive"
msgstr ""
-#: ../dgit:41
22
+#: ../dgit:41
41
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:41
30
+#: ../dgit:41
49
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:41
41
+#: ../dgit:41
60
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:41
44
+#: ../dgit:41
63
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:41
58
+#: ../dgit:41
77
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:42
14
+#: ../dgit:42
33
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:42
23
+#: ../dgit:42
42
msgid "maintainer view tag"
msgstr ""
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:42
25
+#: ../dgit:42
44
msgid "dgit view tag"
msgstr ""
msgid "dgit view tag"
msgstr ""
-#: ../dgit:42
26
+#: ../dgit:42
45
msgid "current archive contents"
msgstr ""
msgid "current archive contents"
msgstr ""
-#: ../dgit:42
39
+#: ../dgit:42
58
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:42
49
+#: ../dgit:42
68
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:42
50
+#: ../dgit:42
69
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:42
54
+#: ../dgit:42
73
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:42
67
+#: ../dgit:42
86
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:42
75
+#: ../dgit:42
94
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4
287
+#: ../dgit:4
306
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:43
09
+#: ../dgit:43
28
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:43
63
+#: ../dgit:43
82
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:56
09
+#: ../dgit:56
42
msgid "maximum search space exceeded"
msgstr ""
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:56
27
+#: ../dgit:56
60
#, perl-format
msgid "has %s not %s"
msgstr ""
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:56
36
+#: ../dgit:56
69
msgid "root commit"
msgstr ""
msgid "root commit"
msgstr ""
-#: ../dgit:56
42
+#: ../dgit:56
75
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:56
54
+#: ../dgit:56
87
#, perl-format
msgid "changed %s"
msgstr ""
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5
673
+#: ../dgit:5
706
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5
680
+#: ../dgit:5
713
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5
692
+#: ../dgit:5
725
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5
695
+#: ../dgit:5
728
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:57
07
+#: ../dgit:57
40
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@
-1069,84
+1069,84
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:57
14
+#: ../dgit:57
47
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:57
48
+#: ../dgit:57
81
msgid "contains unexpected slashes\n"
msgstr ""
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:57
49
+#: ../dgit:57
82
msgid "contains leading punctuation\n"
msgstr ""
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:57
50
+#: ../dgit:57
83
msgid "contains bad character(s)\n"
msgstr ""
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:57
51
+#: ../dgit:57
84
msgid "is series file\n"
msgstr ""
msgid "is series file\n"
msgstr ""
-#: ../dgit:57
52
+#: ../dgit:57
85
msgid "too long\n"
msgstr ""
msgid "too long\n"
msgstr ""
-#: ../dgit:57
56
+#: ../dgit:57
89
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5
785
+#: ../dgit:5
818
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5
868
+#: ../dgit:5
901
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
-#: ../dgit:5
886
+#: ../dgit:5
919
msgid "converted"
msgstr ""
msgid "converted"
msgstr ""
-#: ../dgit:5
887
+#: ../dgit:5
920
#, perl-format
msgid "dgit view: created (%s)"
msgstr ""
#, perl-format
msgid "dgit view: created (%s)"
msgstr ""
-#: ../dgit:59
41
+#: ../dgit:59
74
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:59
51
+#: ../dgit:59
84
msgid "starting quiltify (single-debian-patch)"
msgstr ""
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:60
61
+#: ../dgit:60
94
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6
093
+#: ../dgit:6
126
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6
098
+#: ../dgit:6
131
msgid "dgit view: found cached, no changes required"
msgstr ""
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:61
33
+#: ../dgit:61
66
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:62
47
+#: ../dgit:62
80
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"
msgid ""
"failed to apply your git tree's patch stack (from debian/patches/) to\n"
" the corresponding upstream tarball(s). Your source tree and .orig\n"
@@
-1154,84
+1154,84
@@
msgid ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:62
61
+#: ../dgit:62
94
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6
295
+#: ../dgit:6
328
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
-#: ../dgit:63
08
+#: ../dgit:63
41
msgid "tarball"
msgstr ""
msgid "tarball"
msgstr ""
-#: ../dgit:63
26
+#: ../dgit:63
59
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
-#: ../dgit:63
42
+#: ../dgit:63
75
msgid "tarballs"
msgstr ""
msgid "tarballs"
msgstr ""
-#: ../dgit:63
56
+#: ../dgit:63
89
msgid "upstream"
msgstr ""
msgid "upstream"
msgstr ""
-#: ../dgit:6
380
+#: ../dgit:6
413
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6
390
+#: ../dgit:6
423
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6
399
+#: ../dgit:6
432
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:64
03
+#: ../dgit:64
36
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:64
10
+#: ../dgit:64
43
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
-#: ../dgit:64
14
+#: ../dgit:64
47
msgid "This might be a patches-unapplied branch."
msgstr ""
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:64
17
+#: ../dgit:64
50
msgid "This might be a patches-applied branch."
msgstr ""
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:64
20
+#: ../dgit:64
53
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:64
23
+#: ../dgit:64
56
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:64
27
+#: ../dgit:64
60
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:64
38
+#: ../dgit:64
71
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6
477
+#: ../dgit:6
510
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@
-1240,124
+1240,137
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: ../dgit:6
489
+#: ../dgit:6
522
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:65
18
+#: ../dgit:65
51
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
-#: ../dgit:65
30
+#: ../dgit:65
63
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:65
33
+#: ../dgit:65
66
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:65
36
+#: ../dgit:65
69
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:65
49
+#: ../dgit:65
82
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
-#: ../dgit:65
66
+#: ../dgit:65
99
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6
580
+#: ../dgit:6
613
msgid "clean takes no additional arguments"
msgstr ""
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6
599
+#: ../dgit:6
632
#, perl-format
msgid "-p specified package %s, but changelog says %s"
msgstr ""
#, perl-format
msgid "-p specified package %s, but changelog says %s"
msgstr ""
-#: ../dgit:66
09
+#: ../dgit:66
42
msgid ""
"dgit: --include-dirty is not supported with split view (including with view-"
"splitting quilt modes)"
msgstr ""
msgid ""
"dgit: --include-dirty is not supported with split view (including with view-"
"splitting quilt modes)"
msgstr ""
-#: ../dgit:66
18
+#: ../dgit:66
51
#, perl-format
msgid "dgit: --quilt=%s, %s"
msgstr ""
#, perl-format
msgid "dgit: --quilt=%s, %s"
msgstr ""
-#: ../dgit:66
22
+#: ../dgit:66
55
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
-#: ../dgit:66
57
+#: ../dgit:66
90
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:66
59
+#: ../dgit:66
92
#, perl-format
msgid "would remove %s"
msgstr ""
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6685
+#: ../dgit:6710
+#, perl-format
+msgid "warning: dgit option %s must be passed before %s on dgit command line\n"
+msgstr ""
+
+#: ../dgit:6717
+#, perl-format
+msgid ""
+"warning: option %s should probably be passed to dgit before %s sub-command "
+"on the dgit command line, so that it is seen by dgit and not simply passed "
+"to %s\n"
+msgstr ""
+
+#: ../dgit:6743
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6
691
+#: ../dgit:6
749
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6
694
+#: ../dgit:6
752
msgid "package seems new, not specifying -v<version>"
msgstr ""
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:67
37
+#: ../dgit:67
95
msgid "Wanted to build nothing!"
msgstr ""
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6
775
+#: ../dgit:6
833
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6
782
+#: ../dgit:6
840
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6
789
+#: ../dgit:6
847
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6
793
+#: ../dgit:6
851
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6
798
+#: ../dgit:6
856
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:68
01
+#: ../dgit:68
59
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:68
14
+#: ../dgit:68
72
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@
-1365,136
+1378,136
@@
msgid ""
"Suggest you delete %s.\n"
msgstr ""
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:68
32
+#: ../dgit:68
90
msgid "build successful\n"
msgstr ""
msgid "build successful\n"
msgstr ""
-#: ../dgit:68
39
+#: ../dgit:68
98
#, 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 ""
#, 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:
694
9
+#: ../dgit:
700
9
#, perl-format
msgid "remove %s: %s"
msgstr ""
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:
698
6
+#: ../dgit:
704
6
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:70
0
6
+#: ../dgit:70
6
6
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:70
1
9
+#: ../dgit:70
7
9
msgid "build-source takes no additional arguments"
msgstr ""
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:70
2
3
+#: ../dgit:70
8
3
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:70
3
0
+#: ../dgit:70
9
0
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:70
3
6
+#: ../dgit:70
9
6
msgid "source changes file"
msgstr ""
msgid "source changes file"
msgstr ""
-#: ../dgit:70
3
8
+#: ../dgit:70
9
8
msgid "user-specified changes file is not source-only"
msgstr ""
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:7
058 ../dgit:706
0
+#: ../dgit:7
118 ../dgit:712
0
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:7
073
+#: ../dgit:7
134
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 ""
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:7
085
+#: ../dgit:7
147
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:7
089
+#: ../dgit:7
151
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
msgstr ""
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:71
19
+#: ../dgit:71
81
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:7
140
+#: ../dgit:7
202
msgid "source tree"
msgstr ""
msgid "source tree"
msgstr ""
-#: ../dgit:7
142
+#: ../dgit:7
204
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:7
155
+#: ../dgit:7
217
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:7
159
+#: ../dgit:7
221
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:7
163
+#: ../dgit:7
225
msgid "dry run makes no sense with import-dsc"
msgstr ""
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:7
180
+#: ../dgit:7
242
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:7
185
+#: ../dgit:7
247
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:7
187
+#: ../dgit:7
249
#, perl-format
msgid "read %s: %s"
msgstr ""
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:7
198
+#: ../dgit:7
260
msgid "import-dsc signature check failed"
msgstr ""
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:72
01
+#: ../dgit:72
63
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:72
12
+#: ../dgit:72
74
msgid "Dgit metadata in .dsc"
msgstr ""
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:72
23
+#: ../dgit:72
85
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:72
32
+#: ../dgit:72
94
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@
-1502,21
+1515,21
@@
msgid ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:7
239
+#: ../dgit:7
301
msgid "Not fast forward, forced update."
msgstr ""
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:7
241
+#: ../dgit:7
303
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:7
246
+#: ../dgit:7
308
#, perl-format
msgid "updated git ref %s"
msgstr ""
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7
251
+#: ../dgit:7
313
#, perl-format
msgid ""
"Branch %s already exists\n"
#, perl-format
msgid ""
"Branch %s already exists\n"
@@
-1524,129
+1537,129
@@
msgid ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7
271
+#: ../dgit:7
333
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7
273
+#: ../dgit:7
335
#, perl-format
msgid "stat %s: %s"
msgstr ""
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7
281
+#: ../dgit:7
343
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:73
00
+#: ../dgit:73
62
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:73
04
+#: ../dgit:73
66
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:73
05
+#: ../dgit:73
67
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:73
16
+#: ../dgit:73
78
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:73
18
+#: ../dgit:73
80
msgid "Import, merging."
msgstr ""
msgid "Import, merging."
msgstr ""
-#: ../dgit:73
32
+#: ../dgit:73
94
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7
341
+#: ../dgit:7
403
#, perl-format
msgid "results are in git ref %s"
msgstr ""
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7
348
+#: ../dgit:7
410
msgid "need only 1 subpath argument"
msgstr ""
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7
366
+#: ../dgit:7
428
msgid "need destination argument"
msgstr ""
msgid "need destination argument"
msgstr ""
-#: ../dgit:7
371
+#: ../dgit:7
433
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7
379
+#: ../dgit:7
441
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7
390
+#: ../dgit:7
452
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7
396
+#: ../dgit:7
458
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:74
03 ../dgit:7409
+#: ../dgit:74
65 ../dgit:7471
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:74
15
+#: ../dgit:74
77
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7
462
+#: ../dgit:7
524
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:75
01
+#: ../dgit:75
63
#, perl-format
msgid "%s needs a value"
msgstr ""
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:75
05
+#: ../dgit:75
67
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:76
05
+#: ../dgit:76
67
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:76
23
+#: ../dgit:76
85
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7
678
+#: ../dgit:7
740
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7
693
+#: ../dgit:7
755
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7
697
+#: ../dgit:7
759
#, perl-format
msgid "%s is blocked\n"
msgstr ""
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:77
03
+#: ../dgit:77
65
#, perl-format
msgid ""
"On entry to dgit, %s\n"
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@
-1654,35
+1667,35
@@
msgid ""
"Giving up.\n"
msgstr ""
"Giving up.\n"
msgstr ""
-#: ../dgit:77
20
+#: ../dgit:77
82
#, perl-format
msgid "cannot set command for %s"
msgstr ""
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:77
33
+#: ../dgit:77
95
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7
753
+#: ../dgit:7
815
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7
764
+#: ../dgit:7
826
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7
792
+#: ../dgit:7
854
msgid "DRY RUN ONLY\n"
msgstr ""
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7
793
+#: ../dgit:7
855
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:78
12
+#: ../dgit:78
74
#, perl-format
msgid "unknown operation %s"
msgstr ""
#, perl-format
msgid "unknown operation %s"
msgstr ""
@@
-2364,93
+2377,93
@@
msgstr ""
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:29
6
+#: ../Debian/Dgit.pm:29
8
#, perl-format
msgid "error: %s\n"
msgstr ""
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:32
2
+#: ../Debian/Dgit.pm:32
4
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:34
1
+#: ../Debian/Dgit.pm:34
3
msgid "terminated, reporting successful completion"
msgstr ""
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:34
3
+#: ../Debian/Dgit.pm:34
5
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:34
6
+#: ../Debian/Dgit.pm:34
8
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:35
0
+#: ../Debian/Dgit.pm:35
2
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:35
6
+#: ../Debian/Dgit.pm:35
8
msgid "failed command"
msgstr ""
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:36
2
+#: ../Debian/Dgit.pm:36
4
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:36
4
+#: ../Debian/Dgit.pm:36
6
#, perl-format
msgid "subprocess %s"
msgstr ""
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:36
6
+#: ../Debian/Dgit.pm:36
8
msgid "subprocess produced invalid output"
msgstr ""
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:45
7
+#: ../Debian/Dgit.pm:45
9
msgid "stat source file: %S"
msgstr ""
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:46
7
+#: ../Debian/Dgit.pm:46
9
msgid "stat destination file: %S"
msgstr ""
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:48
6
+#: ../Debian/Dgit.pm:48
8
msgid "finally install file after cp: %S"
msgstr ""
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:49
2
+#: ../Debian/Dgit.pm:49
4
msgid "delete old file after cp: %S"
msgstr ""
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:51
3
+#: ../Debian/Dgit.pm:51
5
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:51
6
+#: ../Debian/Dgit.pm:51
8
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:62
4
+#: ../Debian/Dgit.pm:62
6
msgid "git index contains changes (does not match HEAD)"
msgstr ""
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:62
5
+#: ../Debian/Dgit.pm:62
7
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:64
7
+#: ../Debian/Dgit.pm:64
9
msgid "using specified upstream commitish"
msgstr ""
msgid "using specified upstream commitish"
msgstr ""
-#: ../Debian/Dgit.pm:65
3
+#: ../Debian/Dgit.pm:65
5
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
@@
-2458,66
+2471,66
@@
msgid ""
" Check version, and specify upstream commitish explicitly."
msgstr ""
" Check version, and specify upstream commitish explicitly."
msgstr ""
-#: ../Debian/Dgit.pm:6
59 ../Debian/Dgit.pm:661
+#: ../Debian/Dgit.pm:6
61 ../Debian/Dgit.pm:663
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
-#: ../Debian/Dgit.pm:76
7
+#: ../Debian/Dgit.pm:76
9
msgid "detached HEAD"
msgstr ""
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:7
68
+#: ../Debian/Dgit.pm:7
70
msgid "HEAD symref is not to refs/"
msgstr ""
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:78
4
+#: ../Debian/Dgit.pm:78
6
#, perl-format
msgid "parsing of %s failed"
msgstr ""
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:79
3
+#: ../Debian/Dgit.pm:79
5
#, 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 ""
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"modify the .dsc and then do the signature itself"
msgstr ""
-#: ../Debian/Dgit.pm:80
7
+#: ../Debian/Dgit.pm:80
9
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:8
28
+#: ../Debian/Dgit.pm:8
30
#, perl-format
msgid "missing field %s in %s"
msgstr ""
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:91
4
+#: ../Debian/Dgit.pm:91
6
msgid "Dummy commit - do not use\n"
msgstr ""
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:93
5
+#: ../Debian/Dgit.pm:93
7
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:100
3
+#: ../Debian/Dgit.pm:100
5
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:102
6
+#: ../Debian/Dgit.pm:102
8
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:103
4
+#: ../Debian/Dgit.pm:103
6
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:104
3
+#: ../Debian/Dgit.pm:104
5
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
diff --git
a/po/nl.po
b/po/nl.po
index 837aaa71b1f40190e05df8fb664ed1379923a026..3f68e8602ec81bbe4696042404b2cba90ff0f185 100644
(file)
--- a/
po/nl.po
+++ b/
po/nl.po
@@
-8,7
+8,7
@@
msgid ""
msgstr ""
"Project-Id-Version: dgit_8.3\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: dgit_8.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-0
8-10 18:42
+0000\n"
+"POT-Creation-Date: 2019-0
9-06 22:47
+0000\n"
"PO-Revision-Date: 2019-01-19 20:58+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"PO-Revision-Date: 2019-01-19 20:58+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@
-19,74
+19,74
@@
msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../dgit:26
5
+#: ../dgit:26
7
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr "%s: ongeldige configuratie: %s\n"
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr "%s: ongeldige configuratie: %s\n"
-#: ../dgit:27
2
+#: ../dgit:27
4
msgid "warning: overriding problem due to --force:\n"
msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n"
msgid "warning: overriding problem due to --force:\n"
msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n"
-#: ../dgit:28
0
+#: ../dgit:28
2
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
"waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
"waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
-#: ../dgit:28
5
+#: ../dgit:28
7
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr "%s: broncodepakket %s bestaat niet in suite %s\n"
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr "%s: broncodepakket %s bestaat niet in suite %s\n"
-#: ../dgit:51
7
+#: ../dgit:51
9
#, perl-format
msgid "build host child %s"
msgstr "bouwcomputer-dochter %s"
#, perl-format
msgid "build host child %s"
msgstr "bouwcomputer-dochter %s"
-#: ../dgit:52
2 ../dgit:528
+#: ../dgit:52
4 ../dgit:530
#, perl-format
msgid "connection lost: %s"
msgstr "verbinding verbroken: %s"
#, perl-format
msgid "connection lost: %s"
msgstr "verbinding verbroken: %s"
-#: ../dgit:52
3
+#: ../dgit:52
5
#, perl-format
msgid "protocol violation; %s not expected"
msgstr "protocolschending; %s werd niet verwacht"
#, perl-format
msgid "protocol violation; %s not expected"
msgstr "protocolschending; %s werd niet verwacht"
-#: ../dgit:53
1
+#: ../dgit:53
3
#, perl-format
msgid "eof (reading %s)"
msgstr "eof (bij het lezen van %s)"
#, perl-format
msgid "eof (reading %s)"
msgstr "eof (bij het lezen van %s)"
-#: ../dgit:5
38
+#: ../dgit:5
40
msgid "protocol message"
msgstr "protocolbericht"
msgid "protocol message"
msgstr "protocolbericht"
-#: ../dgit:54
6
+#: ../dgit:54
8
#, perl-format
msgid "`%s'"
msgstr "`%s'"
#, perl-format
msgid "`%s'"
msgstr "`%s'"
-#: ../dgit:56
7
+#: ../dgit:56
9
msgid "bad byte count"
msgstr "aantal slechte bytes"
msgid "bad byte count"
msgstr "aantal slechte bytes"
-#: ../dgit:57
0
+#: ../dgit:57
2
msgid "data block"
msgstr "gegevensblok"
msgid "data block"
msgstr "gegevensblok"
-#: ../dgit:6
49
+#: ../dgit:6
51
#, perl-format
msgid "%s ok: %s"
msgstr "%s oké: %s"
#, perl-format
msgid "%s ok: %s"
msgstr "%s oké: %s"
-#: ../dgit:65
1
+#: ../dgit:65
3
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr "zou oké zijn: %s (maar slechts een testuitvoering)"
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr "zou oké zijn: %s (maar slechts een testuitvoering)"
-#: ../dgit:67
6
+#: ../dgit:67
8
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@
-126,13
+126,13
@@
msgstr ""
" -c<naam>=<waarde> configuratieoptie instellen voor git\n"
" (ook rechtstreeks gebruikt door dgit)\n"
" -c<naam>=<waarde> configuratieoptie instellen voor git\n"
" (ook rechtstreeks gebruikt door dgit)\n"
-#: ../dgit:69
5
+#: ../dgit:69
7
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"
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:
699
+#: ../dgit:
701
#, perl-format
msgid ""
"%s: %s\n"
#, perl-format
msgid ""
"%s: %s\n"
@@
-141,22
+141,22
@@
msgstr ""
"%s: %s\n"
"%s"
"%s: %s\n"
"%s"
-#: ../dgit:70
4
+#: ../dgit:70
6
msgid "too few arguments"
msgstr "te weinig argumenten"
msgid "too few arguments"
msgstr "te weinig argumenten"
-#: ../dgit:82
0
+#: ../dgit:82
2
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr "verschillende waarden voor %s (in %s git config)"
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr "verschillende waarden voor %s (in %s git config)"
-#: ../dgit:82
3
+#: ../dgit:82
5
#, 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)!"
#, 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:84
3
+#: ../dgit:84
5
#, perl-format
msgid ""
"need value for one of: %s\n"
#, perl-format
msgid ""
"need value for one of: %s\n"
@@
-165,45
+165,45
@@
msgstr ""
"heb waarde nodig voor één van: %s\n"
"%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden"
"heb waarde nodig voor één van: %s\n"
"%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden"
-#: ../dgit:
884
+#: ../dgit:
902
#, 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)"
#, 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:
899
+#: ../dgit:
917
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr "backports-spitsvondigheid vereist % of ( )"
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr "backports-spitsvondigheid vereist % of ( )"
-#: ../dgit:9
15
+#: ../dgit:9
33
#, 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'"
#, 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:9
35
+#: ../dgit:9
53
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)"
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:9
53
+#: ../dgit:9
71
#, fuzzy, perl-format
#| msgid "unknown %s setting `%s'"
msgid "unknown %s `%s'"
msgstr "onbekende %s dat `%s' instelt"
#, fuzzy, perl-format
#| msgid "unknown %s setting `%s'"
msgid "unknown %s `%s'"
msgstr "onbekende %s dat `%s' instelt"
-#: ../dgit:9
58 ../git-debrebase:1548 ../Debian/Dgit.pm:209
+#: ../dgit:9
76 ../git-debrebase:1548 ../Debian/Dgit.pm:211
msgid "internal error"
msgstr "interne fout"
msgid "internal error"
msgstr "interne fout"
-#: ../dgit:9
60
+#: ../dgit:9
78
msgid "pushing but distro is configured readonly"
msgstr ""
"bezig een push uit te voeren, maar de distributie is voor alleen-lezen "
"geconfigureerd"
msgid "pushing but distro is configured readonly"
msgstr ""
"bezig een push uit te voeren, maar de distributie is voor alleen-lezen "
"geconfigureerd"
-#: ../dgit:9
64
+#: ../dgit:9
82
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
@@
-212,83
+212,83
@@
msgstr ""
"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost "
"werd.\n"
"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost "
"werd.\n"
-#: ../dgit:
987
+#: ../dgit:
1005
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
#, perl-format
msgid ""
"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
"set to `%s'"
msgstr ""
-#: ../dgit:11
50
+#: ../dgit:11
68
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"
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:12
17
+#: ../dgit:12
36
#, fuzzy, perl-format
#| msgid "fetch of %s gave HTTP code %s"
msgid "fetch of %s failed (%s): %s"
msgstr "een fetch van %s gaf HTTP-code %s"
#, fuzzy, perl-format
#| msgid "fetch of %s gave HTTP code %s"
msgid "fetch of %s failed (%s): %s"
msgstr "een fetch van %s gaf HTTP-code %s"
-#: ../dgit:12
24
+#: ../dgit:12
43
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr "een fetch van %s gaf HTTP-code %s"
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr "een fetch van %s gaf HTTP-code %s"
-#: ../dgit:12
45
+#: ../dgit:12
64
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
"de methode ftpmasterapi voor een verzoek aan het archief kent geen data-"
"onderdeel"
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
"de methode ftpmasterapi voor een verzoek aan het archief kent geen data-"
"onderdeel"
-#: ../dgit:12
63
+#: ../dgit:12
82
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr "onbekende suite %s, misschien is -d nuttig"
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr "onbekende suite %s, misschien is -d nuttig"
-#: ../dgit:12
67
+#: ../dgit:12
86
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr "meerdere overeenkomsten met suite %s\n"
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr "meerdere overeenkomsten met suite %s\n"
-#: ../dgit:12
69
+#: ../dgit:12
88
#, perl-format
msgid "suite %s info has no codename\n"
msgstr "info over suite %s bevat geen codenaam\n"
#, perl-format
msgid "suite %s info has no codename\n"
msgstr "info over suite %s bevat geen codenaam\n"
-#: ../dgit:12
71
+#: ../dgit:12
90
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n"
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n"
-#: ../dgit:12
73 ../dgit:1298
+#: ../dgit:12
92 ../dgit:1317
msgid "bad ftpmaster api response: "
msgstr "verkeerd antwoord van de ftpmaster api:"
msgid "bad ftpmaster api response: "
msgstr "verkeerd antwoord van de ftpmaster api:"
-#: ../dgit:1
287
+#: ../dgit:1
306
#, perl-format
msgid "bad version: %s\n"
msgstr "verkeerde versie: %s\n"
#, perl-format
msgid "bad version: %s\n"
msgstr "verkeerde versie: %s\n"
-#: ../dgit:1
289
+#: ../dgit:1
308
msgid "bad component"
msgstr "verkeerde component"
msgid "bad component"
msgstr "verkeerde component"
-#: ../dgit:1
292
+#: ../dgit:1
311
msgid "bad filename"
msgstr "verkeerde bestandsnaam"
msgid "bad filename"
msgstr "verkeerde bestandsnaam"
-#: ../dgit:1
294
+#: ../dgit:1
313
msgid "bad sha256sum"
msgstr "verkeerde sha256sum"
msgid "bad sha256sum"
msgstr "verkeerde sha256sum"
-#: ../dgit:13
45
+#: ../dgit:13
64
msgid "aptget archive query method takes no data part"
msgstr ""
"de methode aptget voor een verzoek aan het archief kent geen data-onderdeel"
msgid "aptget archive query method takes no data part"
msgstr ""
"de methode aptget voor een verzoek aan het archief kent geen data-onderdeel"
-#: ../dgit:14
29
+#: ../dgit:14
48
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@
-301,21
+301,21
@@
msgstr ""
" zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit "
"het geval zijn, gebruik dan `relatime'.)\n"
" zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit "
"het geval zijn, gebruik dan `relatime'.)\n"
-#: ../dgit:14
53
+#: ../dgit:14
72
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s"
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s"
-#: ../dgit:14
79
+#: ../dgit:14
98
msgid "apt-get source did not produce a .dsc"
msgstr "apt-get source produceerde geen .dsc-bestand"
msgid "apt-get source did not produce a .dsc"
msgstr "apt-get source produceerde geen .dsc-bestand"
-#: ../dgit:14
80
+#: ../dgit:14
99
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)"
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)"
-#: ../dgit:1
585
+#: ../dgit:1
604
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
@@
-324,134
+324,134
@@
msgstr ""
"niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar "
"niet bestaat in suite %s; --existing-package kan behulpzaam zijn"
"niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar "
"niet bestaat in suite %s; --existing-package kan behulpzaam zijn"
-#: ../dgit:17
24
+#: ../dgit:17
43
#, perl-format
msgid "cannot operate on %s suite"
msgstr "kan geen acties uitvoeren op suite %s"
#, perl-format
msgid "cannot operate on %s suite"
msgstr "kan geen acties uitvoeren op suite %s"
-#: ../dgit:17
27
+#: ../dgit:17
46
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr "de gebruikelijke suitenaam voor %s is %s"
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr "de gebruikelijke suitenaam voor %s is %s"
-#: ../dgit:17
29
+#: ../dgit:17
48
#, perl-format
msgid "canonical suite name is %s"
msgstr "de gebruikelijke suitenaam is %s"
#, perl-format
msgid "canonical suite name is %s"
msgstr "de gebruikelijke suitenaam is %s"
-#: ../dgit:17
49
+#: ../dgit:17
68
#, 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"
#, 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:17
55
+#: ../dgit:17
74
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr "niet-ondersteunde broncode-indeling %s, sorry"
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr "niet-ondersteunde broncode-indeling %s, sorry"
-#: ../dgit:1
782
+#: ../dgit:1
801
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)"
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)"
-#: ../dgit:18
05
+#: ../dgit:18
24
#, perl-format
msgid "unknown git-check `%s'"
msgstr "onbekende git-check `%s'"
#, perl-format
msgid "unknown git-check `%s'"
msgstr "onbekende git-check `%s'"
-#: ../dgit:18
20
+#: ../dgit:18
39
#, perl-format
msgid "unknown git-create `%s'"
msgstr "onbekende git-create `%s'"
#, perl-format
msgid "unknown git-create `%s'"
msgstr "onbekende git-create `%s'"
-#: ../dgit:18
57
+#: ../dgit:18
76
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
-#: ../dgit:19
03
+#: ../dgit:19
22
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr "kon .dsc %s regel `%s' niet ontleden"
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr "kon .dsc %s regel `%s' niet ontleden"
-#: ../dgit:19
14
+#: ../dgit:19
33
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s"
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s"
-#: ../dgit:19
60
+#: ../dgit:19
79
#, 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)"
#, 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:19
69
+#: ../dgit:19
88
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr "bestandenlijst in %s varieert tussen hash-velden!"
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr "bestandenlijst in %s varieert tussen hash-velden!"
-#: ../dgit:19
73
+#: ../dgit:19
92
#, perl-format
msgid "%s has no files list field(s)"
msgstr "%s bevat geen veld(en) met een bestandenlijst"
#, perl-format
msgid "%s has no files list field(s)"
msgstr "%s bevat geen veld(en) met een bestandenlijst"
-#: ../dgit:19
79
+#: ../dgit:19
98
#, 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)"
#, 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:20
19
+#: ../dgit:20
38
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n"
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n"
-#: ../dgit:20
32
+#: ../dgit:20
51
msgid "cannot find section/priority from .changes Files field"
msgstr ""
"kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand"
msgid "cannot find section/priority from .changes Files field"
msgstr ""
"kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand"
-#: ../dgit:20
45
+#: ../dgit:20
64
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"
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:20
61
+#: ../dgit:20
80
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ".dsc %s mist een item voor %s"
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ".dsc %s mist een item voor %s"
-#: ../dgit:20
66
+#: ../dgit:20
85
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr "%s: %s (archief) != %s (lokale .dsc)"
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr "%s: %s (archief) != %s (lokale .dsc)"
-#: ../dgit:20
74
+#: ../dgit:20
93
#, perl-format
msgid "archive %s: %s"
msgstr "archief %s: %s"
#, perl-format
msgid "archive %s: %s"
msgstr "archief %s: %s"
-#: ../dgit:2
081
+#: ../dgit:2
100
#, perl-format
msgid "archive contains %s with different checksum"
msgstr "archief bevat %s met een andere checksum"
#, perl-format
msgid "archive contains %s with different checksum"
msgstr "archief bevat %s met een andere checksum"
-#: ../dgit:21
09
+#: ../dgit:21
28
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s"
#, 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:21
17
+#: ../dgit:21
36
#, perl-format
msgid "[new .changes left in %s]"
msgstr "[nieuwe .changes achtergelaten in %s]"
#, perl-format
msgid "[new .changes left in %s]"
msgstr "[nieuwe .changes achtergelaten in %s]"
-#: ../dgit:21
20
+#: ../dgit:21
39
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)"
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)"
-#: ../dgit:21
39
+#: ../dgit:21
58
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
@@
-460,7
+460,7
@@
msgstr ""
"onverwachte indeling `%s' van de auteursregel van de commit (werd "
"gegenereerd uit het Maintainer-veld in changelog)"
"onverwachte indeling `%s' van de auteursregel van de commit (werd "
"gegenereerd uit het Maintainer-veld in changelog)"
-#: ../dgit:21
62
+#: ../dgit:21
81
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@
-487,7
+487,7
@@
msgstr ""
"dat verschillende distributies andere broncode hebben).\n"
"\n"
"dat verschillende distributies andere broncode hebben).\n"
"\n"
-#: ../dgit:21
74
+#: ../dgit:21
93
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
@@
-495,24
+495,24
@@
msgstr ""
"Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan "
"niet voortgaan"
"Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan "
"niet voortgaan"
-#: ../dgit:22
05
+#: ../dgit:22
24
msgid "Dpkg::Vendor `current vendor'"
msgstr "Dpkg::Vendor `current vendor'"
msgid "Dpkg::Vendor `current vendor'"
msgstr "Dpkg::Vendor `current vendor'"
-#: ../dgit:22
07
+#: ../dgit:22
26
msgid "(base) distro being accessed"
msgstr "(basis)-distributie wordt benaderd"
msgid "(base) distro being accessed"
msgstr "(basis)-distributie wordt benaderd"
-#: ../dgit:22
09
+#: ../dgit:22
28
msgid "(nominal) distro being accessed"
msgstr "(nominale) distributie wordt benaderd"
msgid "(nominal) distro being accessed"
msgstr "(nominale) distributie wordt benaderd"
-#: ../dgit:22
14
+#: ../dgit:22
33
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr "build-products-dir %s is niet toegankelijk: %s\n"
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr "build-products-dir %s is niet toegankelijk: %s\n"
-#: ../dgit:22
39
+#: ../dgit:22
58
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
@@
-520,80
+520,80
@@
msgstr ""
"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met "
"overbrengen:\n"
"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met "
"overbrengen:\n"
-#: ../dgit:22
43
+#: ../dgit:22
62
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr "controleer orig-bestand %s in bpd %s: %s"
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr "controleer orig-bestand %s in bpd %s: %s"
-#: ../dgit:22
45
+#: ../dgit:22
64
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr "controleer orig-bestand %s in ..: %s"
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr "controleer orig-bestand %s in ..: %s"
-#: ../dgit:22
48
+#: ../dgit:22
67
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s"
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s"
-#: ../dgit:22
57
+#: ../dgit:22
76
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n"
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n"
-#: ../dgit:22
61
+#: ../dgit:22
80
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr "%s: vast gekoppelde orig van ..: %s\n"
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr "%s: vast gekoppelde orig van ..: %s\n"
-#: ../dgit:22
64
+#: ../dgit:22
83
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s"
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s"
-#: ../dgit:22
70
+#: ../dgit:22
89
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
"%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n"
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
"%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n"
-#: ../dgit:23
41
+#: ../dgit:23
60
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr "dgit (dochter): exec %s: %s"
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr "dgit (dochter): exec %s: %s"
-#: ../dgit:24
03
+#: ../dgit:24
22
msgid "package changelog"
msgstr "changelog van het pakket"
msgid "package changelog"
msgstr "changelog van het pakket"
-#: ../dgit:24
43
+#: ../dgit:24
62
msgid "package changelog has no entries!"
msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!"
msgid "package changelog has no entries!"
msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!"
-#: ../dgit:25
12 ../dgit:2517
+#: ../dgit:25
31 ../dgit:2536
#, perl-format
msgid "accessing %s: %s"
msgstr "bezig met benaderen van %s: %s"
#, perl-format
msgid "accessing %s: %s"
msgstr "bezig met benaderen van %s: %s"
-#: ../dgit:25
32 ../dgit:2539
+#: ../dgit:25
51 ../dgit:2558
#, perl-format
msgid "saving %s: %s"
msgstr "bezig met opslaan van %s: %s"
#, perl-format
msgid "saving %s: %s"
msgstr "bezig met opslaan van %s: %s"
-#: ../dgit:25
65 ../dgit:6037
+#: ../dgit:25
84 ../dgit:6070
msgid "source package"
msgstr "broncodepakket"
msgid "source package"
msgstr "broncodepakket"
-#: ../dgit:26
43
+#: ../dgit:26
62
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr "%s: langzame absurd-git-apply wordt gebruikt..."
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr "%s: langzame absurd-git-apply wordt gebruikt..."
-#: ../dgit:26
62
+#: ../dgit:26
81
#, perl-format
msgid "%s failed: %s\n"
msgstr "%s mislukte: %s\n"
#, perl-format
msgid "%s failed: %s\n"
msgstr "%s mislukte: %s\n"
-#: ../dgit:26
71
+#: ../dgit:26
90
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@
-606,16
+606,16
@@
msgstr ""
" gbp-pq import gaf boom %s\n"
" dpkg-source --before-build gaf boom %s\n"
" gbp-pq import gaf boom %s\n"
" dpkg-source --before-build gaf boom %s\n"
-#: ../dgit:2
686
+#: ../dgit:2
705
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr "git commit samengesteld vanuit .dsc %s"
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr "git commit samengesteld vanuit .dsc %s"
-#: ../dgit:2
690
+#: ../dgit:2
709
msgid "Import of source package"
msgstr "Importeren van broncodepakket"
msgid "Import of source package"
msgstr "Importeren van broncodepakket"
-#: ../dgit:27
10
+#: ../dgit:27
29
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-628,12
+628,12
@@
msgstr ""
"Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n"
"%s\n"
"Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n"
"%s\n"
-#: ../dgit:27
52
+#: ../dgit:27
71
#, perl-format
msgid "using existing %s"
msgstr "bestaande %s wordt gebruikt"
#, perl-format
msgid "using existing %s"
msgstr "bestaande %s wordt gebruikt"
-#: ../dgit:27
56
+#: ../dgit:27
75
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
@@
-642,12
+642,12
@@
msgstr ""
"bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit "
"bestand verwijderen?)"
"bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit "
"bestand verwijderen?)"
-#: ../dgit:27
60
+#: ../dgit:27
79
#, perl-format
msgid "need to fetch correct version of %s"
msgstr "moet de juiste versie van %s ophalen met fetch"
#, perl-format
msgid "need to fetch correct version of %s"
msgstr "moet de juiste versie van %s ophalen met fetch"
-#: ../dgit:27
76
+#: ../dgit:27
95
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
@@
-655,24
+655,24
@@
msgstr ""
"bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd "
"bestand van het archief!)"
"bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd "
"bestand van het archief!)"
-#: ../dgit:28
71
+#: ../dgit:28
90
msgid "too many iterations trying to get sane fetch!"
msgstr "te veel pogingen om een foutloze fetch te bekomen!"
msgid "too many iterations trying to get sane fetch!"
msgstr "te veel pogingen om een foutloze fetch te bekomen!"
-#: ../dgit:2
886
+#: ../dgit:2
905
#, 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"
#, 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:29
30
+#: ../dgit:29
49
#, 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"
#, 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:29
45
+#: ../dgit:29
64
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"
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"
@@
-682,7
+682,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"
"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:29
50
+#: ../dgit:29
69
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@
-698,19
+698,19
@@
msgstr ""
"waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n"
"waarschuwing: bijwerkt. Zal later opnieuw proberen...\n"
"waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n"
"waarschuwing: bijwerkt. Zal later opnieuw proberen...\n"
-#: ../dgit:3
097
+#: ../dgit:3
116
#, 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"
#, 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:31
02
+#: ../dgit:31
21
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald"
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald"
-#: ../dgit:31
07
+#: ../dgit:31
26
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@
-719,7
+719,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"
"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:31
17
+#: ../dgit:31
36
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@
-732,30
+732,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"
".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n"
"(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n"
-#: ../dgit:31
37
+#: ../dgit:31
56
msgid "rewrite map"
msgstr "modificatieplan (rewrite map)"
msgid "rewrite map"
msgstr "modificatieplan (rewrite map)"
-#: ../dgit:31
44
+#: ../dgit:31
63
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!"
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:31
48
+#: ../dgit:31
67
msgid "using rewritten git hash in place of .dsc value"
msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde"
msgid "using rewritten git hash in place of .dsc value"
msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde"
-#: ../dgit:31
50
+#: ../dgit:31
69
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
"de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden"
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:31
57
+#: ../dgit:31
76
msgid "additional commits"
msgstr "extra vastleggingen (commits)"
msgid "additional commits"
msgstr "extra vastleggingen (commits)"
-#: ../dgit:31
60
+#: ../dgit:31
79
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
@@
-764,27
+764,27
@@
msgstr ""
"De Dgit-metadata uit .dsc vereist commit %s\n"
"maar we konden dat object nergens bekomen.\n"
"De Dgit-metadata uit .dsc vereist commit %s\n"
"maar we konden dat object nergens bekomen.\n"
-#: ../dgit:3
185
+#: ../dgit:3
204
msgid "last upload to archive"
msgstr "laatste upload naar het archief"
msgid "last upload to archive"
msgstr "laatste upload naar het archief"
-#: ../dgit:3
189
+#: ../dgit:3
208
msgid "no version available from the archive"
msgstr "geen versie beschikbaar uit het archief"
msgid "no version available from the archive"
msgstr "geen versie beschikbaar uit het archief"
-#: ../dgit:32
72
+#: ../dgit:32
91
msgid "dgit suite branch on dgit git server"
msgstr "dgit suite-tak op dgit git-server"
msgid "dgit suite branch on dgit git server"
msgstr "dgit suite-tak op dgit git-server"
-#: ../dgit:32
79
+#: ../dgit:32
98
msgid "dgit client's archive history view"
msgstr "dgit - weergave geschiedenis van cliëntarchief"
msgid "dgit client's archive history view"
msgstr "dgit - weergave geschiedenis van cliëntarchief"
-#: ../dgit:3
284
+#: ../dgit:3
303
msgid "Dgit field in .dsc from archive"
msgstr "Dgit-veld in het .dsc uit het archief"
msgid "Dgit field in .dsc from archive"
msgstr "Dgit-veld in het .dsc uit het archief"
-#: ../dgit:33
12
+#: ../dgit:33
31
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-800,15
+800,15
@@
msgstr ""
"Laatste versie die met dgit gepusht werd: %s\n"
"%s\n"
"Laatste versie die met dgit gepusht werd: %s\n"
"%s\n"
-#: ../dgit:33
25
+#: ../dgit:33
44
msgid "archive .dsc names newer git commit"
msgstr ".dsc van het archief vermeldt een recentere git commit"
msgid "archive .dsc names newer git commit"
msgstr ".dsc van het archief vermeldt een recentere git commit"
-#: ../dgit:33
28
+#: ../dgit:33
47
msgid "archive .dsc names other git commit, fixing up"
msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd"
msgid "archive .dsc names other git commit, fixing up"
msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd"
-#: ../dgit:33
49
+#: ../dgit:33
68
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-820,7
+820,7
@@
msgstr ""
"dgit.\n"
"%s\n"
"dgit.\n"
"%s\n"
-#: ../dgit:33
58
+#: ../dgit:33
77
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-835,7
+835,7
@@
msgstr ""
"Maar we konden geen enkele versie bekomen uit het archief of uit git.\n"
"\n"
"Maar we konden geen enkele versie bekomen uit het archief of uit git.\n"
"\n"
-#: ../dgit:34
43
+#: ../dgit:34
62
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@
-846,19
+846,19
@@
msgstr ""
"\n"
"Gegeven dat\n"
"\n"
"Gegeven dat\n"
-#: ../dgit:34
56
+#: ../dgit:34
75
msgid "should be treated as descended from\n"
msgstr "behandeld zou moeten worden als afstammend van\n"
msgid "should be treated as descended from\n"
msgstr "behandeld zou moeten worden als afstammend van\n"
-#: ../dgit:34
74
+#: ../dgit:34
93
msgid "dgit repo server tip (last push)"
msgstr "tip van de dgit-opslagplaats op de server (laatste push)"
msgid "dgit repo server tip (last push)"
msgstr "tip van de dgit-opslagplaats op de server (laatste push)"
-#: ../dgit:34
76
+#: ../dgit:34
95
msgid "local tracking tip (last fetch)"
msgstr "tip van de lokale kopie (laatste fetch)"
msgid "local tracking tip (last fetch)"
msgstr "tip van de lokale kopie (laatste fetch)"
-#: ../dgit:3
487
+#: ../dgit:3
506
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-874,15
+874,15
@@
msgstr ""
"We waren slechts in staat om %s te bekomen\n"
"\n"
"We waren slechts in staat om %s te bekomen\n"
"\n"
-#: ../dgit:35
02
+#: ../dgit:35
21
msgid "fetched source tree"
msgstr "broncodeboom opgehaald"
msgid "fetched source tree"
msgstr "broncodeboom opgehaald"
-#: ../dgit:35
38
+#: ../dgit:35
57
msgid "debian/changelog merge driver"
msgstr "stuurprogramma voor samenvoeging van debian/changelog"
msgid "debian/changelog merge driver"
msgstr "stuurprogramma voor samenvoeging van debian/changelog"
-#: ../dgit:36
03
+#: ../dgit:36
22
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
@@
-890,16
+890,16
@@
msgstr ""
"[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n"
" gitattributes wordt niet verder ingesteld\n"
"[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n"
" gitattributes wordt niet verder ingesteld\n"
-#: ../dgit:36
17
+#: ../dgit:36
36
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"
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:36
32
+#: ../dgit:36
51
#, perl-format
msgid "install %s: %s"
msgstr "installeren van %s: %s"
#, perl-format
msgid "install %s: %s"
msgstr "installeren van %s: %s"
-#: ../dgit:36
59
+#: ../dgit:36
78
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@
-910,32
+910,32
@@
msgstr ""
"dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit "
"setup-new-tree.\n"
"dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit "
"setup-new-tree.\n"
-#: ../dgit:3
681
+#: ../dgit:3
700
#, perl-format
msgid "fetching %s..."
msgstr "ophalen van %s..."
#, perl-format
msgid "fetching %s..."
msgstr "ophalen van %s..."
-#: ../dgit:3
689
+#: ../dgit:3
708
#, perl-format
msgid "failed to obtain %s: %s"
msgstr "verkrijgen van %s mislukte: %s"
#, perl-format
msgid "failed to obtain %s: %s"
msgstr "verkrijgen van %s mislukte: %s"
-#: ../dgit:37
28
+#: ../dgit:37
47
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr "pakket %s ontbreekt in (basissuite) %s"
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr "pakket %s ontbreekt in (basissuite) %s"
-#: ../dgit:37
60
+#: ../dgit:37
79
msgid "local combined tracking branch"
msgstr "lokale gecombineerde navolgende tak (tracking branch)"
msgid "local combined tracking branch"
msgstr "lokale gecombineerde navolgende tak (tracking branch)"
-#: ../dgit:37
62
+#: ../dgit:37
81
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
"het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt "
"voorop!"
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:38
01
+#: ../dgit:38
20
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@
-946,7
+946,7
@@
msgstr ""
"\n"
"Invoertakken:\n"
"\n"
"Invoertakken:\n"
-#: ../dgit:38
15
+#: ../dgit:38
34
msgid ""
"\n"
"Key\n"
msgid ""
"\n"
"Key\n"
@@
-960,34
+960,34
@@
msgstr ""
" + markeert elke tak die niet reeds een voorouder was\n"
"\n"
" + markeert elke tak die niet reeds een voorouder was\n"
"\n"
-#: ../dgit:38
30
+#: ../dgit:38
49
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr "berekende gecombineerde navolgende suite %s"
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr "berekende gecombineerde navolgende suite %s"
-#: ../dgit:38
48
+#: ../dgit:38
67
#, perl-format
msgid "ready for work in %s"
msgstr "klaar om te werken in %s"
#, perl-format
msgid "ready for work in %s"
msgstr "klaar om te werken in %s"
-#: ../dgit:38
66
+#: ../dgit:38
85
msgid "dry run makes no sense with clone"
msgstr "dry run is zinloos met clone"
msgid "dry run makes no sense with clone"
msgstr "dry run is zinloos met clone"
-#: ../dgit:3
881
+#: ../dgit:3
900
#, perl-format
msgid "create `%s': %s"
msgstr "creëren van `%s': %s"
#, perl-format
msgid "create `%s': %s"
msgstr "creëren van `%s': %s"
-#: ../dgit:3
893
+#: ../dgit:3
912
msgid "fetching existing git history"
msgstr "ophalen van bestaande git-geschiedenis"
msgid "fetching existing git history"
msgstr "ophalen van bestaande git-geschiedenis"
-#: ../dgit:3
896
+#: ../dgit:3
915
msgid "starting new git history"
msgstr "starten van een nieuwe git-geschiedenis"
msgid "starting new git history"
msgstr "starten van een nieuwe git-geschiedenis"
-#: ../dgit:39
21
+#: ../dgit:39
40
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
@@
-997,33
+997,33
@@
msgstr ""
" De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit "
"update-vcs-git gebruiken?\n"
" De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit "
"update-vcs-git gebruiken?\n"
-#: ../dgit:39
26
+#: ../dgit:39
45
#, perl-format
msgid "fetched into %s"
msgstr "opgehaald naar %s"
#, perl-format
msgid "fetched into %s"
msgstr "opgehaald naar %s"
-#: ../dgit:39
38
+#: ../dgit:39
57
#, perl-format
msgid "Merge from %s [dgit]"
msgstr "Samenvoegen vanuit %s [dgit]"
#, perl-format
msgid "Merge from %s [dgit]"
msgstr "Samenvoegen vanuit %s [dgit]"
-#: ../dgit:39
40
+#: ../dgit:39
59
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr "opgehaald naar %s samengevoegd naar HEAD"
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr "opgehaald naar %s samengevoegd naar HEAD"
-#: ../dgit:39
48
+#: ../dgit:39
67
#, perl-format
msgid "git tree contains %s"
msgstr "git-boom bevat %s"
#, perl-format
msgid "git tree contains %s"
msgstr "git-boom bevat %s"
-#: ../dgit:39
59
+#: ../dgit:39
78
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
"u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet "
"voortgaan:\n"
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:39
78
+#: ../dgit:39
97
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
@@
-1032,15
+1032,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"
"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:
3995
+#: ../dgit:
4014
msgid "nothing quilty to commit, ok."
msgstr "niets quilt-achtig vast te leggen, oké."
msgid "nothing quilty to commit, ok."
msgstr "niets quilt-achtig vast te leggen, oké."
-#: ../dgit:
3998
+#: ../dgit:
4017
msgid " (wanted to commit patch update)"
msgstr " (wilde een patch-update vastleggen)"
msgid " (wanted to commit patch update)"
msgstr " (wilde een patch-update vastleggen)"
-#: ../dgit:40
02
+#: ../dgit:40
21
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
@@
-1048,7
+1048,7
@@
msgstr ""
"Vastleggen van (commit) Debian 3.0 (quilt) metadata\n"
"\n"
"Vastleggen van (commit) Debian 3.0 (quilt) metadata\n"
"\n"
-#: ../dgit:40
46
+#: ../dgit:40
65
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
@@
-1056,60
+1056,60
@@
msgstr ""
"Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --"
"quilt=nocheck"
"Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --"
"quilt=nocheck"
-#: ../dgit:40
51
+#: ../dgit:40
70
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken"
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken"
-#: ../dgit:40
61
+#: ../dgit:40
80
#, perl-format
msgid "commit id %s"
msgstr "vastleggings-id (commit id) %s"
#, perl-format
msgid "commit id %s"
msgstr "vastleggings-id (commit id) %s"
-#: ../dgit:40
67
+#: ../dgit:40
86
#, perl-format
msgid "and left in %s"
msgstr "en achtergelaten in %s"
#, perl-format
msgid "and left in %s"
msgstr "en achtergelaten in %s"
-#: ../dgit:4
093
+#: ../dgit:4
112
#, 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"
#, 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:4
096
+#: ../dgit:4
115
#, 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"
#, 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:41
04
+#: ../dgit:41
23
#, 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"
#, 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:41
13
+#: ../dgit:41
32
msgid "version currently in archive"
msgstr "momenteel in het archief aanwezige versie"
msgid "version currently in archive"
msgstr "momenteel in het archief aanwezige versie"
-#: ../dgit:41
22
+#: ../dgit:41
41
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
"Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie "
"%s ..."
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
"Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie "
"%s ..."
-#: ../dgit:41
30
+#: ../dgit:41
49
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr "veld %s van dpkg-parsechangelog %s"
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr "veld %s van dpkg-parsechangelog %s"
-#: ../dgit:41
41
+#: ../dgit:41
60
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr "Vermeldt debian/changelog misschien %s niet?"
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr "Vermeldt debian/changelog misschien %s niet?"
-#: ../dgit:41
44
+#: ../dgit:41
63
#, perl-format
msgid ""
"%s is %s\n"
#, perl-format
msgid ""
"%s is %s\n"
@@
-1118,99
+1118,99
@@
msgstr ""
"%s is %s\n"
"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n"
"%s is %s\n"
"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n"
-#: ../dgit:41
58
+#: ../dgit:41
77
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..."
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..."
-#: ../dgit:42
14
+#: ../dgit:42
33
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..."
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..."
-#: ../dgit:42
23
+#: ../dgit:42
42
msgid "maintainer view tag"
msgstr "tag weergave pakketonderhouder"
msgid "maintainer view tag"
msgstr "tag weergave pakketonderhouder"
-#: ../dgit:42
25
+#: ../dgit:42
44
msgid "dgit view tag"
msgstr "tag weergave dgit"
msgid "dgit view tag"
msgstr "tag weergave dgit"
-#: ../dgit:42
26
+#: ../dgit:42
45
msgid "current archive contents"
msgstr "huidige inhoud van het archief"
msgid "current archive contents"
msgstr "huidige inhoud van het archief"
-#: ../dgit:42
39
+#: ../dgit:42
58
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"
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:42
49
+#: ../dgit:42
68
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr "Lineair (fast forward) declareren vanuit %s\n"
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr "Lineair (fast forward) declareren vanuit %s\n"
-#: ../dgit:42
50
+#: ../dgit:42
69
#, perl-format
msgid "Make fast forward from %s\n"
msgstr "Lineair (fast forward) maken vanuit %s\n"
#, perl-format
msgid "Make fast forward from %s\n"
msgstr "Lineair (fast forward) maken vanuit %s\n"
-#: ../dgit:42
54
+#: ../dgit:42
73
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave."
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave."
-#: ../dgit:42
67
+#: ../dgit:42
86
#, perl-format
msgid "Declare fast forward from %s"
msgstr "Lineair (fast forward) declareren vanuit %s"
#, perl-format
msgid "Declare fast forward from %s"
msgstr "Lineair (fast forward) declareren vanuit %s"
-#: ../dgit:42
75
+#: ../dgit:42
94
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD."
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD."
-#: ../dgit:4
287
+#: ../dgit:4
306
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
-#: ../dgit:43
09
+#: ../dgit:43
28
#, 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"
#, 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:43
63
+#: ../dgit:43
82
#, 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"
#, 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:56
09
+#: ../dgit:56
42
msgid "maximum search space exceeded"
msgstr "maximale zoekruimte overschreden"
msgid "maximum search space exceeded"
msgstr "maximale zoekruimte overschreden"
-#: ../dgit:56
27
+#: ../dgit:56
60
#, perl-format
msgid "has %s not %s"
msgstr "bevat %s, niet %s"
#, perl-format
msgid "has %s not %s"
msgstr "bevat %s, niet %s"
-#: ../dgit:56
36
+#: ../dgit:56
69
msgid "root commit"
msgstr "beginvastlegging (root commit)"
msgid "root commit"
msgstr "beginvastlegging (root commit)"
-#: ../dgit:56
42
+#: ../dgit:56
75
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr "samenvoeging (merge) (%s niet-triviale ouders)"
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr "samenvoeging (merge) (%s niet-triviale ouders)"
-#: ../dgit:56
54
+#: ../dgit:56
87
#, perl-format
msgid "changed %s"
msgstr "gewijzigd: %s"
#, perl-format
msgid "changed %s"
msgstr "gewijzigd: %s"
-#: ../dgit:5
673
+#: ../dgit:5
706
#, perl-format
msgid ""
"\n"
#, perl-format
msgid ""
"\n"
@@
-1219,23
+1219,23
@@
msgstr ""
"\n"
"%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n"
"\n"
"%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n"
-#: ../dgit:5
680
+#: ../dgit:5
713
#, perl-format
msgid "%s: %s: %s\n"
msgstr "%s: %s: %s\n"
#, perl-format
msgid "%s: %s: %s\n"
msgstr "%s: %s: %s\n"
-#: ../dgit:5
692
+#: ../dgit:5
725
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"
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:5
695
+#: ../dgit:5
728
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
"de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..."
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
"de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..."
-#: ../dgit:57
07
+#: ../dgit:57
40
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@
-1246,88
+1246,88
@@
msgstr ""
"Laatste (tot en met) %s git-wijzigingen, ter informatie:\n"
"\n"
"Laatste (tot en met) %s git-wijzigingen, ter informatie:\n"
"\n"
-#: ../dgit:57
14
+#: ../dgit:57
47
msgid "quiltify linearisation planning successful, executing..."
msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..."
msgid "quiltify linearisation planning successful, executing..."
msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..."
-#: ../dgit:57
48
+#: ../dgit:57
81
msgid "contains unexpected slashes\n"
msgstr "bevat onverwachte slashes\n"
msgid "contains unexpected slashes\n"
msgstr "bevat onverwachte slashes\n"
-#: ../dgit:57
49
+#: ../dgit:57
82
msgid "contains leading punctuation\n"
msgstr "bevat leestekens aan het begin\n"
msgid "contains leading punctuation\n"
msgstr "bevat leestekens aan het begin\n"
-#: ../dgit:57
50
+#: ../dgit:57
83
msgid "contains bad character(s)\n"
msgstr "bevat foutieve teken(s)\n"
msgid "contains bad character(s)\n"
msgstr "bevat foutieve teken(s)\n"
-#: ../dgit:57
51
+#: ../dgit:57
84
msgid "is series file\n"
msgstr "is een series-bestand\n"
msgid "is series file\n"
msgstr "is een series-bestand\n"
-#: ../dgit:57
52
+#: ../dgit:57
85
msgid "too long\n"
msgstr "te lang\n"
msgid "too long\n"
msgstr "te lang\n"
-#: ../dgit:57
56
+#: ../dgit:57
89
#, 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"
#, 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:5
785
+#: ../dgit:5
818
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr "dgit: fout bij de transliteratie van de patch-titel: %s"
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr "dgit: fout bij de transliteratie van de patch-titel: %s"
-#: ../dgit:5
868
+#: ../dgit:5
901
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s does not make sense (or is not supported) with single-debian-"
"patch"
msgstr ""
-#: ../dgit:5
886
+#: ../dgit:5
919
msgid "converted"
msgstr "omgezet"
msgid "converted"
msgstr "omgezet"
-#: ../dgit:5
887
+#: ../dgit:5
920
#, perl-format
msgid "dgit view: created (%s)"
msgstr "dgit-weergave: gecreëerd: (%s)"
#, perl-format
msgid "dgit view: created (%s)"
msgstr "dgit-weergave: gecreëerd: (%s)"
-#: ../dgit:59
41
+#: ../dgit:59
74
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
"Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n"
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
"Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n"
-#: ../dgit:59
51
+#: ../dgit:59
84
msgid "starting quiltify (single-debian-patch)"
msgstr "quiltify wordt gestart (één enkele debian-patch)"
msgid "starting quiltify (single-debian-patch)"
msgstr "quiltify wordt gestart (één enkele debian-patch)"
-#: ../dgit:60
61
+#: ../dgit:60
94
#, 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)."
#, 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:6
093
+#: ../dgit:6
126
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr "dgit-weergave: gecachete (%s) aangetroffen"
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr "dgit-weergave: gecachete (%s) aangetroffen"
-#: ../dgit:6
098
+#: ../dgit:6
131
msgid "dgit view: found cached, no changes required"
msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist"
msgid "dgit view: found cached, no changes required"
msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist"
-#: ../dgit:61
33
+#: ../dgit:61
66
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)"
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)"
-#: ../dgit:62
47
+#: ../dgit:62
80
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"
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"
@@
-1341,37
+1341,37
@@
msgstr ""
" dgit can enkel bepaalde soorten anomalieën repareren\n"
" (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n"
" dgit can enkel bepaalde soorten anomalieën repareren\n"
" (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n"
-#: ../dgit:62
61
+#: ../dgit:62
94
msgid "Tree already contains .pc - will use it then delete it."
msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen."
msgid "Tree already contains .pc - will use it then delete it."
msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen."
-#: ../dgit:6
295
+#: ../dgit:6
328
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
msgid "baredebian quilt fixup: could not find any origs"
msgstr ""
-#: ../dgit:63
08
+#: ../dgit:63
41
msgid "tarball"
msgstr ""
msgid "tarball"
msgstr ""
-#: ../dgit:63
26
+#: ../dgit:63
59
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
#, perl-format
msgid "Combine orig tarballs for %s %s"
msgstr ""
-#: ../dgit:63
42
+#: ../dgit:63
75
msgid "tarballs"
msgstr ""
msgid "tarballs"
msgstr ""
-#: ../dgit:63
56
+#: ../dgit:63
89
msgid "upstream"
msgstr ""
msgid "upstream"
msgstr ""
-#: ../dgit:6
380
+#: ../dgit:6
413
#, 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"
#, 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:6
390
+#: ../dgit:6
423
#, fuzzy, perl-format
#| msgid ""
#| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
#, fuzzy, perl-format
#| msgid ""
#| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
@@
-1383,54
+1383,54
@@
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"
"%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:6
399
+#: ../dgit:6
432
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr "dgit: kan wijziging niet representeren: %s: %s\n"
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr "dgit: kan wijziging niet representeren: %s: %s\n"
-#: ../dgit:64
03
+#: ../dgit:64
36
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"
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:64
10
+#: ../dgit:64
43
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
msgid ""
"This has only a debian/ directory; you probably want --quilt=bare debian."
msgstr ""
-#: ../dgit:64
14
+#: ../dgit:64
47
msgid "This might be a patches-unapplied branch."
msgstr "Dit is mogelijk een tak zonder toepassing van patches."
msgid "This might be a patches-unapplied branch."
msgstr "Dit is mogelijk een tak zonder toepassing van patches."
-#: ../dgit:64
17
+#: ../dgit:64
50
msgid "This might be a patches-applied branch."
msgstr "Dit is mogelijk een tak met toegepaste patches."
msgid "This might be a patches-applied branch."
msgstr "Dit is mogelijk een tak met toegepaste patches."
-#: ../dgit:64
20
+#: ../dgit:64
53
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 ?"
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:64
23
+#: ../dgit:64
56
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
"Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)."
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
"Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)."
-#: ../dgit:64
27
+#: ../dgit:64
60
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?"
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:64
38
+#: ../dgit:64
71
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr "quiltify wordt gestart (meerdere patches, %s-modus)"
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr "quiltify wordt gestart (meerdere patches, %s-modus)"
-#: ../dgit:6
477
+#: ../dgit:6
510
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@
-1445,13
+1445,13
@@
msgstr ""
"dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n"
"\n"
"dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n"
"\n"
-#: ../dgit:6
489
+#: ../dgit:6
522
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."
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:65
18
+#: ../dgit:65
51
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
@@
-1463,18
+1463,18
@@
msgstr ""
"negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te "
"gebruiken.\n"
"negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te "
"gebruiken.\n"
-#: ../dgit:65
30
+#: ../dgit:65
63
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
"de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven"
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
"de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven"
-#: ../dgit:65
33
+#: ../dgit:65
66
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)"
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:65
36
+#: ../dgit:65
69
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
@@
-1482,29
+1482,29
@@
msgstr ""
"de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n"
"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen."
"de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n"
"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen."
-#: ../dgit:65
49
+#: ../dgit:65
82
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
#, perl-format
msgid ""
"quilt mode %s (generally needs untracked upstream files)\n"
"contradicts clean mode %s (which would delete them)\n"
msgstr ""
-#: ../dgit:65
66
+#: ../dgit:65
99
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
"de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)"
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
"de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)"
-#: ../dgit:6
580
+#: ../dgit:6
613
msgid "clean takes no additional arguments"
msgstr "met clean kunnen geen extra argumenten opgegeven worden"
msgid "clean takes no additional arguments"
msgstr "met clean kunnen geen extra argumenten opgegeven worden"
-#: ../dgit:6
599
+#: ../dgit:6
632
#, fuzzy, perl-format
#| msgid "-p specified %s but changelog specified %s"
msgid "-p specified package %s, but changelog says %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
#, fuzzy, perl-format
#| msgid "-p specified %s but changelog specified %s"
msgid "-p specified package %s, but changelog says %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
-#: ../dgit:66
09
+#: ../dgit:66
42
#, fuzzy
#| msgid "dgit: --include-dirty is not supported in split view quilt mode"
msgid ""
#, fuzzy
#| msgid "dgit: --include-dirty is not supported in split view quilt mode"
msgid ""
@@
-1514,76
+1514,89
@@
msgstr ""
"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
"weergave"
"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
"weergave"
-#: ../dgit:66
18
+#: ../dgit:66
51
#, fuzzy, perl-format
#| msgid "dgit: import-dsc: %s"
msgid "dgit: --quilt=%s, %s"
msgstr "dgit: import-dsc: %s"
#, fuzzy, perl-format
#| msgid "dgit: import-dsc: %s"
msgid "dgit: --quilt=%s, %s"
msgstr "dgit: import-dsc: %s"
-#: ../dgit:66
22
+#: ../dgit:66
55
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
msgstr ""
-#: ../dgit:66
57
+#: ../dgit:66
90
#, perl-format
msgid "remove old changes file %s: %s"
msgstr "verwijder oud changes-bestand %s: %s"
#, perl-format
msgid "remove old changes file %s: %s"
msgstr "verwijder oud changes-bestand %s: %s"
-#: ../dgit:66
59
+#: ../dgit:66
92
#, perl-format
msgid "would remove %s"
msgstr "zou %s verwijderen"
#, perl-format
msgid "would remove %s"
msgstr "zou %s verwijderen"
-#: ../dgit:6685
+#: ../dgit:6710
+#, perl-format
+msgid "warning: dgit option %s must be passed before %s on dgit command line\n"
+msgstr ""
+
+#: ../dgit:6717
+#, perl-format
+msgid ""
+"warning: option %s should probably be passed to dgit before %s sub-command "
+"on the dgit command line, so that it is seen by dgit and not simply passed "
+"to %s\n"
+msgstr ""
+
+#: ../dgit:6743
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
"mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet "
"opgegeven werd)"
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:6
691
+#: ../dgit:6
749
#, perl-format
msgid "changelog will contain changes since %s"
msgstr "changelog zal wijzigingen sinds %s bevatten"
#, perl-format
msgid "changelog will contain changes since %s"
msgstr "changelog zal wijzigingen sinds %s bevatten"
-#: ../dgit:6
694
+#: ../dgit:6
752
msgid "package seems new, not specifying -v<version>"
msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>"
msgid "package seems new, not specifying -v<version>"
msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>"
-#: ../dgit:67
37
+#: ../dgit:67
95
msgid "Wanted to build nothing!"
msgstr "Wilde niets bouwen!"
msgid "Wanted to build nothing!"
msgstr "Wilde niets bouwen!"
-#: ../dgit:6
775
+#: ../dgit:6
833
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr "slechts één changes-bestand van bouw (%s)\n"
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr "slechts één changes-bestand van bouw (%s)\n"
-#: ../dgit:6
782
+#: ../dgit:6
840
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten"
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten"
-#: ../dgit:6
789
+#: ../dgit:6
847
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw"
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw"
-#: ../dgit:6
793
+#: ../dgit:6
851
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr "installeer nieuw changes %s{,.inmulti}: %s"
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr "installeer nieuw changes %s{,.inmulti}: %s"
-#: ../dgit:6
798
+#: ../dgit:6
856
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr "fout nummer van verschillende changes-bestanden (%s)"
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr "fout nummer van verschillende changes-bestanden (%s)"
-#: ../dgit:68
01
+#: ../dgit:68
59
#, perl-format
msgid "build successful, results in %s\n"
msgstr "bouw was succesvol, resultaten in %s\n"
#, perl-format
msgid "build successful, results in %s\n"
msgstr "bouw was succesvol, resultaten in %s\n"
-#: ../dgit:68
14
+#: ../dgit:68
72
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@
-1595,11
+1608,11
@@
msgstr ""
"resultaat.\n"
"De suggestie is dat u %s verwijdert.\n"
"resultaat.\n"
"De suggestie is dat u %s verwijdert.\n"
-#: ../dgit:68
32
+#: ../dgit:68
90
msgid "build successful\n"
msgstr "de bouw was succesvol\n"
msgid "build successful\n"
msgstr "de bouw was succesvol\n"
-#: ../dgit:68
39
+#: ../dgit:68
98
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
@@
-1610,30
+1623,30
@@
msgstr ""
"%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen "
"gaan naar ..\n"
"%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen "
"gaan naar ..\n"
-#: ../dgit:
694
9
+#: ../dgit:
700
9
#, perl-format
msgid "remove %s: %s"
msgstr "verwijder %s: %s"
#, perl-format
msgid "remove %s: %s"
msgstr "verwijder %s: %s"
-#: ../dgit:
698
6
+#: ../dgit:
704
6
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry"
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry"
-#: ../dgit:70
0
6
+#: ../dgit:70
6
6
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s"
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s"
-#: ../dgit:70
1
9
+#: ../dgit:70
7
9
msgid "build-source takes no additional arguments"
msgstr "build-source moet zonder bijkomende argumenten gebruikt worden"
msgid "build-source takes no additional arguments"
msgstr "build-source moet zonder bijkomende argumenten gebruikt worden"
-#: ../dgit:70
2
3
+#: ../dgit:70
8
3
#, perl-format
msgid "source built, results in %s and %s"
msgstr "broncodepakket is gebouwd, resultaten in %s en %s"
#, perl-format
msgid "source built, results in %s and %s"
msgstr "broncodepakket is gebouwd, resultaten in %s en %s"
-#: ../dgit:70
3
0
+#: ../dgit:70
9
0
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
@@
-1641,21
+1654,21
@@
msgstr ""
"dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-"
"source!"
"dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-"
"source!"
-#: ../dgit:70
3
6
+#: ../dgit:70
9
6
msgid "source changes file"
msgstr "broncode-changes-bestand"
msgid "source changes file"
msgstr "broncode-changes-bestand"
-#: ../dgit:70
3
8
+#: ../dgit:70
9
8
msgid "user-specified changes file is not source-only"
msgstr ""
"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'"
msgid "user-specified changes file is not source-only"
msgstr ""
"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'"
-#: ../dgit:7
058 ../dgit:706
0
+#: ../dgit:7
118 ../dgit:712
0
#, perl-format
msgid "%s (in build products dir): %s"
msgstr "%s (in bouwproductenmap): %s"
#, perl-format
msgid "%s (in build products dir): %s"
msgstr "%s (in bouwproductenmap): %s"
-#: ../dgit:7
073
+#: ../dgit:7
134
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"
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"
@@
-1664,7
+1677,7
@@
msgstr ""
"specifieke\n"
"binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n"
"specifieke\n"
"binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n"
-#: ../dgit:7
085
+#: ../dgit:7
147
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
@@
-1672,7
+1685,7
@@
msgstr ""
"u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair "
"pakket - is dit echt wat u bedoelde?"
"u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair "
"pakket - is dit echt wat u bedoelde?"
-#: ../dgit:7
089
+#: ../dgit:7
151
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
@@
-1681,65
+1694,65
@@
msgstr ""
"debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is "
"onmogelijk"
"debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is "
"onmogelijk"
-#: ../dgit:71
19
+#: ../dgit:71
81
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr "foutieve argumenten voor dgit print-unapplied-treeish"
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr "foutieve argumenten voor dgit print-unapplied-treeish"
-#: ../dgit:7
140
+#: ../dgit:7
202
msgid "source tree"
msgstr "broncodeboom"
msgid "source tree"
msgstr "broncodeboom"
-#: ../dgit:7
142
+#: ../dgit:7
204
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr "dgit: import-dsc: %s"
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr "dgit: import-dsc: %s"
-#: ../dgit:7
155
+#: ../dgit:7
217
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc"
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc"
-#: ../dgit:7
159
+#: ../dgit:7
221
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK"
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK"
-#: ../dgit:7
163
+#: ../dgit:7
225
msgid "dry run makes no sense with import-dsc"
msgstr "testuitvoering (dry run) is zinloos met import-dsc"
msgid "dry run makes no sense with import-dsc"
msgstr "testuitvoering (dry run) is zinloos met import-dsc"
-#: ../dgit:7
180
+#: ../dgit:7
242
#, perl-format
msgid "%s is checked out - will not update it"
msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken"
#, perl-format
msgid "%s is checked out - will not update it"
msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken"
-#: ../dgit:7
185
+#: ../dgit:7
247
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr "open import-.dsc (%s): %s"
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr "open import-.dsc (%s): %s"
-#: ../dgit:7
187
+#: ../dgit:7
249
#, perl-format
msgid "read %s: %s"
msgstr "lees %s: %s"
#, perl-format
msgid "read %s: %s"
msgstr "lees %s: %s"
-#: ../dgit:7
198
+#: ../dgit:7
260
msgid "import-dsc signature check failed"
msgstr "controle ondertekening van import-dsc mislukte"
msgid "import-dsc signature check failed"
msgstr "controle ondertekening van import-dsc mislukte"
-#: ../dgit:72
01
+#: ../dgit:72
63
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n"
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n"
-#: ../dgit:72
12
+#: ../dgit:72
74
msgid "Dgit metadata in .dsc"
msgstr "Dgit-metadata in .dsc"
msgid "Dgit metadata in .dsc"
msgstr "Dgit-metadata in .dsc"
-#: ../dgit:72
23
+#: ../dgit:72
85
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"
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:72
32
+#: ../dgit:72
94
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@
-1750,21
+1763,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"
"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:7
239
+#: ../dgit:7
301
msgid "Not fast forward, forced update."
msgstr "Niet lineair (fast forward), gedwongen update."
msgid "Not fast forward, forced update."
msgstr "Niet lineair (fast forward), gedwongen update."
-#: ../dgit:7
241
+#: ../dgit:7
303
#, perl-format
msgid "Not fast forward to %s"
msgstr "Niet lineair (fast forward) naar %s"
#, perl-format
msgid "Not fast forward to %s"
msgstr "Niet lineair (fast forward) naar %s"
-#: ../dgit:7
246
+#: ../dgit:7
308
#, perl-format
msgid "updated git ref %s"
msgstr "git ref %s geüpdatet"
#, perl-format
msgid "updated git ref %s"
msgstr "git ref %s geüpdatet"
-#: ../dgit:7
251
+#: ../dgit:7
313
#, perl-format
msgid ""
"Branch %s already exists\n"
#, perl-format
msgid ""
"Branch %s already exists\n"
@@
-1776,88
+1789,88
@@
msgstr ""
"geschiedenis\n"
"Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n"
"geschiedenis\n"
"Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n"
-#: ../dgit:7
271
+#: ../dgit:7
333
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr "lstat %s werkt maar stat geeft %s !"
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr "lstat %s werkt maar stat geeft %s !"
-#: ../dgit:7
273
+#: ../dgit:7
335
#, perl-format
msgid "stat %s: %s"
msgstr "stat %s: %s"
#, perl-format
msgid "stat %s: %s"
msgstr "stat %s: %s"
-#: ../dgit:7
281
+#: ../dgit:7
343
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr "importeren van %s vereist %s, maar: %s"
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr "importeren van %s vereist %s, maar: %s"
-#: ../dgit:73
00
+#: ../dgit:73
62
#, 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!"
#, 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:73
04
+#: ../dgit:73
66
#, perl-format
msgid "symlink %s to %s: %s"
msgstr "symbolische koppeling %s naar %s: %s"
#, perl-format
msgid "symlink %s to %s: %s"
msgstr "symbolische koppeling %s naar %s: %s"
-#: ../dgit:73
05
+#: ../dgit:73
67
#, perl-format
msgid "made symlink %s -> %s"
msgstr "maakte symbolische koppeling %s -> %s"
#, perl-format
msgid "made symlink %s -> %s"
msgstr "maakte symbolische koppeling %s -> %s"
-#: ../dgit:73
16
+#: ../dgit:73
78
msgid "Import, forced update - synthetic orphan git history."
msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis."
msgid "Import, forced update - synthetic orphan git history."
msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis."
-#: ../dgit:73
18
+#: ../dgit:73
80
msgid "Import, merging."
msgstr "Import, bezig met samenvoegen."
msgid "Import, merging."
msgstr "Import, bezig met samenvoegen."
-#: ../dgit:73
32
+#: ../dgit:73
94
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr "Invoegen van import %s (%s) in %s\n"
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr "Invoegen van import %s (%s) in %s\n"
-#: ../dgit:7
341
+#: ../dgit:7
403
#, perl-format
msgid "results are in git ref %s"
msgstr "resultaten staan in git ref %s"
#, perl-format
msgid "results are in git ref %s"
msgstr "resultaten staan in git ref %s"
-#: ../dgit:7
348
+#: ../dgit:7
410
msgid "need only 1 subpath argument"
msgstr "slechts 1 argument met een onderliggend pad nodig"
msgid "need only 1 subpath argument"
msgstr "slechts 1 argument met een onderliggend pad nodig"
-#: ../dgit:7
366
+#: ../dgit:7
428
msgid "need destination argument"
msgstr "bestemmingsargument nodig"
msgid "need destination argument"
msgstr "bestemmingsargument nodig"
-#: ../dgit:7
371
+#: ../dgit:7
433
#, perl-format
msgid "exec git clone: %s\n"
msgstr "exec git clone: %s\n"
#, perl-format
msgid "exec git clone: %s\n"
msgstr "exec git clone: %s\n"
-#: ../dgit:7
379
+#: ../dgit:7
441
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url"
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:7
390
+#: ../dgit:7
452
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores"
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores"
-#: ../dgit:7
396
+#: ../dgit:7
458
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs"
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs"
-#: ../dgit:74
03 ../dgit:7409
+#: ../dgit:74
65 ../dgit:7471
msgid "no arguments allowed to dgit setup-useremail"
msgstr "geen argumenten toegelaten bij dgit setup-useremail"
msgid "no arguments allowed to dgit setup-useremail"
msgstr "geen argumenten toegelaten bij dgit setup-useremail"
-#: ../dgit:74
15
+#: ../dgit:74
77
msgid "no arguments allowed to dgit setup-tree"
msgstr "geen argumenten toegelaten bij dgit setup-tree"
msgid "no arguments allowed to dgit setup-tree"
msgstr "geen argumenten toegelaten bij dgit setup-tree"
-#: ../dgit:7
462
+#: ../dgit:7
524
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
@@
-1865,42
+1878,42
@@
msgstr ""
"--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map "
"op te geven."
"--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map "
"op te geven."
-#: ../dgit:75
01
+#: ../dgit:75
63
#, perl-format
msgid "%s needs a value"
msgstr "%s moet een waarde hebben"
#, perl-format
msgid "%s needs a value"
msgstr "%s moet een waarde hebben"
-#: ../dgit:75
05
+#: ../dgit:75
67
#, perl-format
msgid "bad value `%s' for %s"
msgstr "foute waarde `%s' voor %s"
#, perl-format
msgid "bad value `%s' for %s"
msgstr "foute waarde `%s' voor %s"
-#: ../dgit:76
05
+#: ../dgit:76
67
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n"
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n"
-#: ../dgit:76
23
+#: ../dgit:76
85
#, perl-format
msgid "unknown long option `%s'"
msgstr "onbekende lange optie `%s'"
#, perl-format
msgid "unknown long option `%s'"
msgstr "onbekende lange optie `%s'"
-#: ../dgit:7
678
+#: ../dgit:7
740
#, perl-format
msgid "unknown short option `%s'"
msgstr "onbekende korte optie `%s'"
#, perl-format
msgid "unknown short option `%s'"
msgstr "onbekende korte optie `%s'"
-#: ../dgit:7
693
+#: ../dgit:7
755
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n"
#, 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:7
697
+#: ../dgit:7
759
#, perl-format
msgid "%s is blocked\n"
msgstr "%s is geblokkeerd\n"
#, perl-format
msgid "%s is blocked\n"
msgstr "%s is geblokkeerd\n"
-#: ../dgit:77
03
+#: ../dgit:77
65
#, perl-format
msgid ""
"On entry to dgit, %s\n"
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@
-1911,37
+1924,37
@@
msgstr ""
"Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n"
"Er wordt opgegeven.\n"
"Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n"
"Er wordt opgegeven.\n"
-#: ../dgit:77
20
+#: ../dgit:77
82
#, perl-format
msgid "cannot set command for %s"
msgstr "kan commando voor %s niet instellen"
#, perl-format
msgid "cannot set command for %s"
msgstr "kan commando voor %s niet instellen"
-#: ../dgit:77
33
+#: ../dgit:77
95
#, perl-format
msgid "cannot configure options for %s"
msgstr "kan opties voor %s niet configureren"
#, perl-format
msgid "cannot configure options for %s"
msgstr "kan opties voor %s niet configureren"
-#: ../dgit:7
753
+#: ../dgit:7
815
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr "onbekende quilt-modus `%s'"
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr "onbekende quilt-modus `%s'"
-#: ../dgit:7
764
+#: ../dgit:7
826
#, perl-format
msgid "unknown %s setting `%s'"
msgstr "onbekende %s dat `%s' instelt"
#, perl-format
msgid "unknown %s setting `%s'"
msgstr "onbekende %s dat `%s' instelt"
-#: ../dgit:7
792
+#: ../dgit:7
854
msgid "DRY RUN ONLY\n"
msgstr "ENKEL TESTUITVOERING (DRY RUN)\n"
msgid "DRY RUN ONLY\n"
msgstr "ENKEL TESTUITVOERING (DRY RUN)\n"
-#: ../dgit:7
793
+#: ../dgit:7
855
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
"GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) "
"WIJZIGINGEN MAKEN\n"
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
"GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) "
"WIJZIGINGEN MAKEN\n"
-#: ../dgit:78
12
+#: ../dgit:78
74
#, perl-format
msgid "unknown operation %s"
msgstr "onbekende bewerking %s"
#, perl-format
msgid "unknown operation %s"
msgstr "onbekende bewerking %s"
@@
-2695,70
+2708,70
@@
msgstr "%s: niet gek van -i voor git-rebase"
msgid "unknown git-debrebase sub-operation %s"
msgstr "onbekende onderliggende bewerking van git-debrebase: %s"
msgid "unknown git-debrebase sub-operation %s"
msgstr "onbekende onderliggende bewerking van git-debrebase: %s"
-#: ../Debian/Dgit.pm:29
6
+#: ../Debian/Dgit.pm:29
8
#, perl-format
msgid "error: %s\n"
msgstr "fout: %s\n"
#, perl-format
msgid "error: %s\n"
msgstr "fout: %s\n"
-#: ../Debian/Dgit.pm:32
2
+#: ../Debian/Dgit.pm:32
4
#, perl-format
msgid "getcwd failed: %s\n"
msgstr "getcwd mislukte: %s\n"
#, perl-format
msgid "getcwd failed: %s\n"
msgstr "getcwd mislukte: %s\n"
-#: ../Debian/Dgit.pm:34
1
+#: ../Debian/Dgit.pm:34
3
msgid "terminated, reporting successful completion"
msgstr "beëindigd, met de melding van een succesvolle voltooiing"
msgid "terminated, reporting successful completion"
msgstr "beëindigd, met de melding van een succesvolle voltooiing"
-#: ../Debian/Dgit.pm:34
3
+#: ../Debian/Dgit.pm:34
5
#, perl-format
msgid "failed with error exit status %s"
msgstr "mislukt met de foutmelding %s"
#, perl-format
msgid "failed with error exit status %s"
msgstr "mislukt met de foutmelding %s"
-#: ../Debian/Dgit.pm:34
6
+#: ../Debian/Dgit.pm:34
8
#, perl-format
msgid "died due to fatal signal %s"
msgstr "gestorven vanwege fataal signaal %s"
#, perl-format
msgid "died due to fatal signal %s"
msgstr "gestorven vanwege fataal signaal %s"
-#: ../Debian/Dgit.pm:35
0
+#: ../Debian/Dgit.pm:35
2
#, perl-format
msgid "failed with unknown wait status %s"
msgstr "mislukt met ongekende wachttoestand %s"
#, perl-format
msgid "failed with unknown wait status %s"
msgstr "mislukt met ongekende wachttoestand %s"
-#: ../Debian/Dgit.pm:35
6
+#: ../Debian/Dgit.pm:35
8
msgid "failed command"
msgstr "mislukt commando"
msgid "failed command"
msgstr "mislukt commando"
-#: ../Debian/Dgit.pm:36
2
+#: ../Debian/Dgit.pm:36
4
#, perl-format
msgid "failed to fork/exec: %s"
msgstr "fork/exec is mislukt: %s"
#, perl-format
msgid "failed to fork/exec: %s"
msgstr "fork/exec is mislukt: %s"
-#: ../Debian/Dgit.pm:36
4
+#: ../Debian/Dgit.pm:36
6
#, perl-format
msgid "subprocess %s"
msgstr "onderliggend proces %s"
#, perl-format
msgid "subprocess %s"
msgstr "onderliggend proces %s"
-#: ../Debian/Dgit.pm:36
6
+#: ../Debian/Dgit.pm:36
8
msgid "subprocess produced invalid output"
msgstr "onderliggend proces produceerde ongeldige uitvoer"
msgid "subprocess produced invalid output"
msgstr "onderliggend proces produceerde ongeldige uitvoer"
-#: ../Debian/Dgit.pm:45
7
+#: ../Debian/Dgit.pm:45
9
msgid "stat source file: %S"
msgstr "stat bronbestand: %S"
msgid "stat source file: %S"
msgstr "stat bronbestand: %S"
-#: ../Debian/Dgit.pm:46
7
+#: ../Debian/Dgit.pm:46
9
msgid "stat destination file: %S"
msgstr "stat doelbestand: %S"
msgid "stat destination file: %S"
msgstr "stat doelbestand: %S"
-#: ../Debian/Dgit.pm:48
6
+#: ../Debian/Dgit.pm:48
8
msgid "finally install file after cp: %S"
msgstr "tot slot, installeer bestand na cp: %S"
msgid "finally install file after cp: %S"
msgstr "tot slot, installeer bestand na cp: %S"
-#: ../Debian/Dgit.pm:49
2
+#: ../Debian/Dgit.pm:49
4
msgid "delete old file after cp: %S"
msgstr "verwijder oud bestand na cp: %S"
msgid "delete old file after cp: %S"
msgstr "verwijder oud bestand na cp: %S"
-#: ../Debian/Dgit.pm:51
3
+#: ../Debian/Dgit.pm:51
5
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
@@
-2766,26
+2779,26
@@
msgstr ""
"niet in een git werkboom?\n"
"(git rev-parse --show-toplevel gaf geen uitvoer)\n"
"niet in een git werkboom?\n"
"(git rev-parse --show-toplevel gaf geen uitvoer)\n"
-#: ../Debian/Dgit.pm:51
6
+#: ../Debian/Dgit.pm:51
8
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr "chdir naar hoogste niveau %s: %s\n"
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr "chdir naar hoogste niveau %s: %s\n"
-#: ../Debian/Dgit.pm:62
4
+#: ../Debian/Dgit.pm:62
6
msgid "git index contains changes (does not match HEAD)"
msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)"
msgid "git index contains changes (does not match HEAD)"
msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:62
5
+#: ../Debian/Dgit.pm:62
7
msgid "working tree is dirty (does not match HEAD)"
msgstr "werkboom is bevuild (komt niet overeen met HEAD)"
msgid "working tree is dirty (does not match HEAD)"
msgstr "werkboom is bevuild (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:64
7
+#: ../Debian/Dgit.pm:64
9
#, fuzzy
#| msgid "found mixed upstream/packaging commit"
msgid "using specified upstream commitish"
msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
#, fuzzy
#| msgid "found mixed upstream/packaging commit"
msgid "using specified upstream commitish"
msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
-#: ../Debian/Dgit.pm:65
3
+#: ../Debian/Dgit.pm:65
5
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
#, perl-format
msgid ""
"Could not determine appropriate upstream commitish.\n"
@@
-2796,25
+2809,25
@@
msgstr ""
" (Probeerde deze tags: %s)\n"
" Controleer versie en geef toeleveraar-commitish expliciet op."
" (Probeerde deze tags: %s)\n"
" Controleer versie en geef toeleveraar-commitish expliciet op."
-#: ../Debian/Dgit.pm:6
59 ../Debian/Dgit.pm:661
+#: ../Debian/Dgit.pm:6
61 ../Debian/Dgit.pm:663
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
#, perl-format
msgid "using upstream from git tag %s"
msgstr ""
-#: ../Debian/Dgit.pm:76
7
+#: ../Debian/Dgit.pm:76
9
msgid "detached HEAD"
msgstr "vrijstaande HEAD (detached HEAD)"
msgid "detached HEAD"
msgstr "vrijstaande HEAD (detached HEAD)"
-#: ../Debian/Dgit.pm:7
68
+#: ../Debian/Dgit.pm:7
70
msgid "HEAD symref is not to refs/"
msgstr "symbolische referentie HEAD is geen referentie naar refs/"
msgid "HEAD symref is not to refs/"
msgstr "symbolische referentie HEAD is geen referentie naar refs/"
-#: ../Debian/Dgit.pm:78
4
+#: ../Debian/Dgit.pm:78
6
#, perl-format
msgid "parsing of %s failed"
msgstr "ontleden van %s mislukte"
#, perl-format
msgid "parsing of %s failed"
msgstr "ontleden van %s mislukte"
-#: ../Debian/Dgit.pm:79
3
+#: ../Debian/Dgit.pm:79
5
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
@@
-2823,41
+2836,41
@@
msgstr ""
"controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit "
"push het .dsc moet aanpassen en het dan zelf moet ondertekenen"
"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:80
7
+#: ../Debian/Dgit.pm:80
9
#, perl-format
msgid "open %s (%s): %s"
msgstr "open %s (%s): %s"
#, perl-format
msgid "open %s (%s): %s"
msgstr "open %s (%s): %s"
-#: ../Debian/Dgit.pm:8
28
+#: ../Debian/Dgit.pm:8
30
#, perl-format
msgid "missing field %s in %s"
msgstr "ontbrekend veld %s in %s"
#, perl-format
msgid "missing field %s in %s"
msgstr "ontbrekend veld %s in %s"
-#: ../Debian/Dgit.pm:91
4
+#: ../Debian/Dgit.pm:91
6
msgid "Dummy commit - do not use\n"
msgstr "Voorbeeldvastlegging - niet gebruiken\n"
msgid "Dummy commit - do not use\n"
msgstr "Voorbeeldvastlegging - niet gebruiken\n"
-#: ../Debian/Dgit.pm:93
5
+#: ../Debian/Dgit.pm:93
7
#, perl-format
msgid "exec %s: %s\n"
msgstr "exec %s: %s\n"
#, perl-format
msgid "exec %s: %s\n"
msgstr "exec %s: %s\n"
-#: ../Debian/Dgit.pm:100
3
+#: ../Debian/Dgit.pm:100
5
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr "kan status van %s/.git niet verkrijgen: %s"
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr "kan status van %s/.git niet verkrijgen: %s"
-#: ../Debian/Dgit.pm:102
6
+#: ../Debian/Dgit.pm:102
8
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr "mkdir van speelplaatsouder %s mislukte: %s"
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr "mkdir van speelplaatsouder %s mislukte: %s"
-#: ../Debian/Dgit.pm:103
4
+#: ../Debian/Dgit.pm:103
6
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr "mkdir van een speelplaats %s mislukte: %s"
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr "mkdir van een speelplaats %s mislukte: %s"
-#: ../Debian/Dgit.pm:104
3
+#: ../Debian/Dgit.pm:104
5
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr "mkdir van de speelplaats %s mislukte: %s"
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr "mkdir van de speelplaats %s mislukte: %s"
diff --git
a/po4a/dgit-maint-debrebase_7.pot
b/po4a/dgit-maint-debrebase_7.pot
index 3c253481de4f478089bf9c82de631e9cb5805551..4f1f8aab8b55080779ae93571b65f145d472baf2 100644
(file)
--- 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"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-0
7-21 01:3
7+0100\n"
+"POT-Creation-Date: 2019-0
9-06 23:4
7+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-28,13
+28,13
@@
msgid "NAME"
msgstr ""
#. type: =head1
msgstr ""
#. type: =head1
-#: ../dgit.1:15
49
../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:15
68
../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:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
-#: ../git-debrebase.1.pod:6
19
../git-debrebase.5.pod:678
-#: ../git-debpush.1.pod:2
23
+#: ../git-debrebase.1.pod:6
33
../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:2
54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@
-43,7
+43,7
@@
msgstr ""
#: ../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
#: ../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
-#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.
1.pod:10 ../git-debrebase.
5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
msgid "INTRODUCTION"
msgstr ""
@@
-305,7
+305,7
@@
msgstr ""
#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
-" % git
remote update
\n"
+" % git
fetch --all --tags
\n"
"\n"
msgstr ""
"\n"
msgstr ""
@@
-383,7
+383,7
@@
msgstr ""
#. type: =head1
#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
#. type: =head1
#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
-#: ../git-debpush.1.pod:2
28
+#: ../git-debpush.1.pod:2
59
msgid "AUTHOR"
msgstr ""
msgid "AUTHOR"
msgstr ""
diff --git
a/po4a/dgit-maint-merge_7.pot
b/po4a/dgit-maint-merge_7.pot
index 129dca5e192f465e652f52219ac729e4022c6024..e79a09c50ff17c6eeb3c34c1283dea9ed814765b 100644
(file)
--- a/
po4a/dgit-maint-merge_7.pot
+++ b/
po4a/dgit-maint-merge_7.pot
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-0
7-21 01:3
7+0100\n"
+"POT-Creation-Date: 2019-0
9-06 23:4
7+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-46,13
+46,13
@@
msgid "3."
msgstr ""
#. type: =head1
msgstr ""
#. type: =head1
-#: ../dgit.1:15
49
../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:15
68
../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:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
-#: ../git-debrebase.1.pod:6
19
../git-debrebase.5.pod:678
-#: ../git-debpush.1.pod:2
23
+#: ../git-debrebase.1.pod:6
33
../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:2
54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@
-61,7
+61,7
@@
msgstr ""
#: ../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
#: ../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
-#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.
1.pod:10 ../git-debrebase.
5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
msgid "INTRODUCTION"
msgstr ""
@@
-671,7
+671,7
@@
msgstr ""
#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
-" % git
remote update
\n"
+" % git
fetch --all --tags
\n"
"\n"
msgstr ""
"\n"
msgstr ""
@@
-895,7
+895,7
@@
msgstr ""
#. type: =head1
#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
#. type: =head1
#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
-#: ../git-debpush.1.pod:2
28
+#: ../git-debpush.1.pod:2
59
msgid "AUTHOR"
msgstr ""
msgid "AUTHOR"
msgstr ""
diff --git
a/po4a/dgit_1.pot
b/po4a/dgit_1.pot
index 3d6de787d3846388a3112d106810bf0703ee60be..da13ddcc8621ccf436ef7c94709c99d1312da253 100644
(file)
--- a/
po4a/dgit_1.pot
+++ b/
po4a/dgit_1.pot
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-0
8-10 19:42
+0100\n"
+"POT-Creation-Date: 2019-0
9-06 23:47
+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-418,7
+418,7
@@
msgid "B<dgit help>"
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:185 ../dgit.1:12
69
+#: ../dgit.1:185 ../dgit.1:12
71
msgid "Print a usage summary."
msgstr ""
msgid "Print a usage summary."
msgstr ""
@@
-1206,7
+1206,7
@@
msgid "B<-N> | B<--new>"
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:63
7
+#: ../dgit.1:63
8
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 "
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 "
@@
-1214,13
+1214,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:63
7
+#: ../dgit.1:63
8
#, no-wrap
msgid "B<--include-dirty>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--include-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:64
5
+#: ../dgit.1:64
6
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 "
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 "
@@
-1230,7
+1230,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:65
7
+#: ../dgit.1:65
8
msgid ""
"Note that this does B<not> prevent dgit from cleaning your tree, so if the "
"changes in your working tree are in the form of untracked files, those might "
msgid ""
"Note that this does B<not> prevent dgit from cleaning your tree, so if the "
"changes in your working tree are in the form of untracked files, those might "
@@
-1241,24
+1241,24
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:65
7
+#: ../dgit.1:65
8
#, no-wrap
msgid "B<--ignore-dirty>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--ignore-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:66
0
+#: ../dgit.1:66
1
msgid "Deprecated alias for --include-dirty."
msgstr ""
#. type: TP
msgid "Deprecated alias for --include-dirty."
msgstr ""
#. type: TP
-#: ../dgit.1:66
0
+#: ../dgit.1:66
1
#, no-wrap
msgid "B<--overwrite>[=I<previous-version>]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--overwrite>[=I<previous-version>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:67
1
+#: ../dgit.1:67
2
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<previous-"
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<previous-"
@@
-1267,14
+1267,14
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:67
8
+#: ../dgit.1:67
9
msgid ""
"It is safer not to specify I<previous-version>, and usually it's not "
"needed. Just say B<--overwrite>, unless you know what you are doing."
msgstr ""
#. type: Plain text
msgid ""
"It is safer not to specify I<previous-version>, and usually it's not "
"needed. Just say B<--overwrite>, unless you know what you are doing."
msgstr ""
#. type: Plain text
-#: ../dgit.1:68
2
+#: ../dgit.1:68
3
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 "
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 "
@@
-1282,14
+1282,14
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:68
8
+#: ../dgit.1:68
9
msgid ""
"This option is also usually necessary the first time a package is pushed "
"with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>."
msgstr ""
#. type: Plain text
msgid ""
"This option is also usually necessary the first time a package is pushed "
"with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>."
msgstr ""
#. type: Plain text
-#: ../dgit.1:70
2
+#: ../dgit.1:70
3
msgid ""
"If I<previous-version> is not specified, dgit will check that the version in "
"the archive is mentioned in your debian/changelog. (This will avoid losing "
msgid ""
"If I<previous-version> is not specified, dgit will check that the version in "
"the archive is mentioned in your debian/changelog. (This will avoid losing "
@@
-1300,7
+1300,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:70
8
+#: ../dgit.1:70
9
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 "
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 "
@@
-1309,7
+1309,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:71
3
+#: ../dgit.1:71
4
msgid ""
"(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a "
"split between the dgit view and the maintainer view, the pseudo-merge will "
msgid ""
"(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a "
"split between the dgit view and the maintainer view, the pseudo-merge will "
@@
-1317,18
+1317,18
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:71
3
+#: ../dgit.1:71
4
#, no-wrap
msgid "B<--delayed>=I<days>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--delayed>=I<days>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:71
6
+#: ../dgit.1:71
7
msgid "Upload to a DELAYED queue."
msgstr ""
#. type: Plain text
msgid "Upload to a DELAYED queue."
msgstr ""
#. type: Plain text
-#: ../dgit.1:72
6
+#: ../dgit.1:72
7
msgid ""
"B<WARNING:> 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 "
msgid ""
"B<WARNING:> 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 "
@@
-1338,27
+1338,27
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:73
1
+#: ../dgit.1:73
2
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
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:73
1
+#: ../dgit.1:73
2
#, no-wrap
msgid "B<--no-chase-dsc-distro>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--no-chase-dsc-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:73
7
+#: ../dgit.1:73
8
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
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:74
7
+#: ../dgit.1:74
8
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 "
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 "
@@
-1367,7
+1367,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:75
5
+#: ../dgit.1:75
6
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 "
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 "
@@
-1376,13
+1376,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:75
5
+#: ../dgit.1:75
6
#, no-wrap
msgid "B<--save-dgit-view=>I<branch>|I<ref>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--save-dgit-view=>I<branch>|I<ref>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:76
5
+#: ../dgit.1:76
6
msgid ""
"Specifies that when split view is in operation, and dgit calculates (or "
"looks up in its cache) a dgit view corresponding to your HEAD, the dgit "
msgid ""
"Specifies that when split view is in operation, and dgit calculates (or "
"looks up in its cache) a dgit view corresponding to your HEAD, the dgit "
@@
-1391,7
+1391,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:7
69
+#: ../dgit.1:7
70
msgid ""
"This option is effective only with the following operations: quilt-fixup; "
"push; all builds. And it is only effective when split view is actually in "
msgid ""
"This option is effective only with the following operations: quilt-fixup; "
"push; all builds. And it is only effective when split view is actually in "
@@
-1399,25
+1399,25
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:77
3
+#: ../dgit.1:77
4
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
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:77
7
+#: ../dgit.1:77
8
msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
msgstr ""
#. type: TP
msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
msgstr ""
#. type: TP
-#: ../dgit.1:77
7
+#: ../dgit.1:77
8
#, no-wrap
msgid "B<--deliberately->I<something>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--deliberately->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:79
1
+#: ../dgit.1:79
2
msgid ""
"Declare that you are deliberately doing I<something>. This can be used to "
"override safety catches, including safety catches which relate to distro-"
msgid ""
"Declare that you are deliberately doing I<something>. This can be used to "
"override safety catches, including safety catches which relate to distro-"
@@
-1429,13
+1429,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:79
1
+#: ../dgit.1:79
2
#, no-wrap
msgid "B<--deliberately-not-fast-forward>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--deliberately-not-fast-forward>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:79
7
+#: ../dgit.1:79
9
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 "
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 "
@@
-1444,7
+1444,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:8
08
+#: ../dgit.1:8
10
msgid ""
"When split view is in operation, this also prevents the construction by dgit "
"of a pseudomerge to make the dgit view fast forwarding. Normally only one "
msgid ""
"When split view is in operation, this also prevents the construction by dgit "
"of a pseudomerge to make the dgit view fast forwarding. Normally only one "
@@
-1454,13
+1454,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:8
08
+#: ../dgit.1:8
10
#, no-wrap
msgid "B<--deliberately-include-questionable-history>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--deliberately-include-questionable-history>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:81
7
+#: ../dgit.1:81
9
msgid ""
"Declare that you are deliberately including, in the git history of your "
"current push, history which contains a previously-submitted version of this "
msgid ""
"Declare that you are deliberately including, in the git history of your "
"current push, history which contains a previously-submitted version of this "
@@
-1472,13
+1472,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:81
7
+#: ../dgit.1:81
9
#, no-wrap
msgid "B<--deliberately-fresh-repo>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--deliberately-fresh-repo>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:82
2
+#: ../dgit.1:82
4
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 "
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 "
@@
-1486,13
+1486,13
@@
msgid ""
msgstr ""
#. type: =item
msgstr ""
#. type: =item
-#: ../dgit.1:82
2
../git-debpush.1.pod:112
+#: ../dgit.1:82
4
../git-debpush.1.pod:112
#, no-wrap
msgid "B<--quilt=linear>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--quilt=linear>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:8
29
+#: ../dgit.1:8
31
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 "
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 "
@@
-1500,20
+1500,20
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:83
4
+#: ../dgit.1:83
6
msgid ""
"HEAD should be a series of plain commits (not touching debian/patches/), and "
"pseudomerges, with as ancestor a patches-applied branch."
msgstr ""
#. type: =item
msgid ""
"HEAD should be a series of plain commits (not touching debian/patches/), and "
"pseudomerges, with as ancestor a patches-applied branch."
msgstr ""
#. type: =item
-#: ../dgit.1:83
4
../git-debpush.1.pod:124
+#: ../dgit.1:83
6
../git-debpush.1.pod:124
#, no-wrap
msgid "B<--quilt=auto>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--quilt=auto>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:84
3
+#: ../dgit.1:84
5
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a "
"linear patch stack (as with --quilt=linear) but if that doesn't seem "
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a "
"linear patch stack (as with --quilt=linear) but if that doesn't seem "
@@
-1523,13
+1523,13
@@
msgid ""
msgstr ""
#. type: =item
msgstr ""
#. type: =item
-#: ../dgit.1:84
3
../git-debpush.1.pod:118
+#: ../dgit.1:84
5
../git-debpush.1.pod:118
#, no-wrap
msgid "B<--quilt=smash>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--quilt=smash>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:8
48
+#: ../dgit.1:8
50
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 "
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 "
@@
-1537,7
+1537,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:85
4
+#: ../dgit.1:85
6
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 "
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 "
@@
-1546,13
+1546,13
@@
msgid ""
msgstr ""
#. type: =item
msgstr ""
#. type: =item
-#: ../dgit.1:85
4
../git-debpush.1.pod:129
+#: ../dgit.1:85
6
../git-debpush.1.pod:129
#, no-wrap
msgid "B<--quilt=nofix>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--quilt=nofix>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:86
2
+#: ../dgit.1:86
4
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 "
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 "
@@
-1561,13
+1561,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:86
2
+#: ../dgit.1:86
4
#, no-wrap
msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:86
7
+#: ../dgit.1:86
9
msgid ""
"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. "
"If you use this option and the metadata did in fact need fixing up, dgit "
msgid ""
"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. "
"If you use this option and the metadata did in fact need fixing up, dgit "
@@
-1575,27
+1575,27
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:86
7
+#: ../dgit.1:86
9
#, no-wrap
msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:87
4
+#: ../dgit.1:87
6
msgid ""
"Tell dgit that you are using a nearly-dgit-compatible git branch, aka a "
"B<maintainer view>, and do not want your branch changed by dgit."
msgstr ""
#. type: Plain text
msgid ""
"Tell dgit that you are using a nearly-dgit-compatible git branch, aka a "
"B<maintainer view>, and do not want your branch changed by dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:8
78
+#: ../dgit.1:8
80
msgid ""
"These quilt modes are known as B<splitting quilt modes>. See --split-view, "
"below."
msgstr ""
#. type: Plain text
msgid ""
"These quilt modes are known as B<splitting quilt modes>. See --split-view, "
"below."
msgstr ""
#. type: Plain text
-#: ../dgit.1:88
6
+#: ../dgit.1:88
8
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 "
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 "
@@
-1604,7
+1604,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:89
4
+#: ../dgit.1:89
6
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 "
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 "
@@
-1612,7
+1612,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:
899
+#: ../dgit.1:
901
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 "
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 "
@@
-1620,7
+1620,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:91
3
+#: ../dgit.1:91
5
msgid ""
"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies "
"that your HEAD contains only a debian/ directory, with any changes to "
msgid ""
"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies "
"that your HEAD contains only a debian/ directory, with any changes to "
@@
-1632,7
+1632,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:92
4
+#: ../dgit.1:92
6
msgid ""
"B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when "
"there is no appropriate upstream git history. To construct the dgit view, "
msgid ""
"B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when "
"there is no appropriate upstream git history. To construct the dgit view, "
@@
-1643,7
+1643,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:94
2
+#: ../dgit.1:94
4
msgid ""
"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like "
"quilt-fixup and build) will automatically generate a conversion of your git "
msgid ""
"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like "
"quilt-fixup and build) will automatically generate a conversion of your git "
@@
-1657,7
+1657,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:95
1
+#: ../dgit.1:95
3
msgid ""
"B<If you have a branch like this it is essential to specify the appropriate "
"--quilt= option!> This is because it is not always possible to tell: a "
msgid ""
"B<If you have a branch like this it is essential to specify the appropriate "
"--quilt= option!> This is because it is not always possible to tell: a "
@@
-1669,13
+1669,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:95
1
+#: ../dgit.1:95
3
#, no-wrap
msgid "B<-d>I<distro> | B<--distro=>I<distro>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-d>I<distro> | B<--distro=>I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:96
0
+#: ../dgit.1:96
2
msgid ""
"Specifies that the suite to be operated on is part of distro I<distro>. "
"This overrides the default value found from the git config option B<dgit-"
msgid ""
"Specifies that the suite to be operated on is part of distro I<distro>. "
"This overrides the default value found from the git config option B<dgit-"
@@
-1685,7
+1685,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:96
6
+#: ../dgit.1:96
8
msgid ""
"If your suite is part of a distro that dgit already knows about, you can use "
"this option to make dgit work even if your dgit doesn't know about the "
msgid ""
"If your suite is part of a distro that dgit already knows about, you can use "
"this option to make dgit work even if your dgit doesn't know about the "
@@
-1694,7
+1694,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:97
1
+#: ../dgit.1:97
3
msgid ""
"To define a new distro it is necessary to define methods and URLs for "
"fetching (and, for dgit push, altering) a variety of information both in the "
msgid ""
"To define a new distro it is necessary to define methods and URLs for "
"fetching (and, for dgit push, altering) a variety of information both in the "
@@
-1702,20
+1702,20
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:97
1
+#: ../dgit.1:97
3
#, no-wrap
msgid "B<--split-view=auto>|B<always>|B<never>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--split-view=auto>|B<always>|B<never>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:97
6
+#: ../dgit.1:97
8
msgid ""
"Controls whether dgit operates a split view, separating your own branch (as "
"Debian maintainer) from that shown to users of dgit clone and dgit fetch."
msgstr ""
#. type: Plain text
msgid ""
"Controls whether dgit operates a split view, separating your own branch (as "
"Debian maintainer) from that shown to users of dgit clone and dgit fetch."
msgstr ""
#. type: Plain text
-#: ../dgit.1:98
4
+#: ../dgit.1:98
6
msgid ""
"When split view is in operation dgit will not make or merge any commits onto "
"your own branch. Specifically, only the dgit view will contain dgit's "
msgid ""
"When split view is in operation dgit will not make or merge any commits onto "
"your own branch. Specifically, only the dgit view will contain dgit's "
@@
-1725,7
+1725,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:99
0
+#: ../dgit.1:99
2
msgid ""
"B<auto> is the default, and splits the view only when needed: i.e., when you "
"are working with a `3.0 (quilt)' source package and a splitting quilt mode: "
msgid ""
"B<auto> is the default, and splits the view only when needed: i.e., when you "
"are working with a `3.0 (quilt)' source package and a splitting quilt mode: "
@@
-1733,18
+1733,18
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:99
3
+#: ../dgit.1:99
5
msgid ""
"B<always> splits the view regardless of the source format and the quilt mode."
msgstr ""
#. type: Plain text
msgid ""
"B<always> splits the view regardless of the source format and the quilt mode."
msgstr ""
#. type: Plain text
-#: ../dgit.1:99
6
+#: ../dgit.1:99
8
msgid "B<never> will cause dgit to fail if split view is needed."
msgstr ""
#. type: Plain text
msgid "B<never> will cause dgit to fail if split view is needed."
msgstr ""
#. type: Plain text
-#: ../dgit.1:100
4
+#: ../dgit.1:100
6
msgid ""
"When split view is in operation, the dgit view is visible in your local git "
"clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/"
msgid ""
"When split view is in operation, the dgit view is visible in your local git "
"clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/"
@@
-1752,20
+1752,20
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:100
7
+#: ../dgit.1:100
9
msgid ""
"Note that split view does not affect dgit fetch, and is not compatible with "
"dgit pull."
msgstr ""
#. type: TP
msgid ""
"Note that split view does not affect dgit fetch, and is not compatible with "
"dgit pull."
msgstr ""
#. type: TP
-#: ../dgit.1:100
7
+#: ../dgit.1:100
9
#, no-wrap
msgid "B<-C>I<changesfile>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-C>I<changesfile>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:101
2
+#: ../dgit.1:101
4
msgid ""
"Specifies the .changes file which is to be uploaded. By default dgit push "
"looks for a single .changes file in the parent directory whose filename "
msgid ""
"Specifies the .changes file which is to be uploaded. By default dgit push "
"looks for a single .changes file in the parent directory whose filename "
@@
-1773,7
+1773,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:102
1
+#: ../dgit.1:102
3
msgid ""
"If the specified I<changesfile> pathname contains slashes, the directory "
"part is also used as the value for B<--build-products-dir>; otherwise, the "
msgid ""
"If the specified I<changesfile> pathname contains slashes, the directory "
"part is also used as the value for B<--build-products-dir>; otherwise, the "
@@
-1781,13
+1781,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:102
1
+#: ../dgit.1:102
3
#, no-wrap
msgid "B<--upstream-commitish=>I<upstream>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--upstream-commitish=>I<upstream>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:10
29
+#: ../dgit.1:10
31
msgid ""
"For use with --quilt=baredebian only. Specifies the commit containing the "
"upstream source. This commit must be identical to your .orig tarball. The "
msgid ""
"For use with --quilt=baredebian only. Specifies the commit containing the "
"upstream source. This commit must be identical to your .orig tarball. The "
@@
-1796,13
+1796,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:10
29
+#: ../dgit.1:10
31
#, no-wrap
msgid "B<--rm-old-changes>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:104
1
+#: ../dgit.1:104
3
msgid ""
"When doing a build, delete any changes files matching "
"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that "
msgid ""
"When doing a build, delete any changes files matching "
"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that "
@@
-1814,32
+1814,32
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:104
4
+#: ../dgit.1:104
6
msgid ""
"Note that B<dgit push-source> will always find the right .changes, "
"regardless of this option."
msgstr ""
#. type: TP
msgid ""
"Note that B<dgit push-source> will always find the right .changes, "
"regardless of this option."
msgstr ""
#. type: TP
-#: ../dgit.1:104
4
+#: ../dgit.1:104
6
#, no-wrap
msgid "B<--build-products-dir=>I<directory>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--build-products-dir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:10
48
+#: ../dgit.1:10
50
msgid ""
"Specifies where to find and create tarballs, binary packages, source "
"packages, .changes files, and so on."
msgstr ""
#. type: Plain text
msgid ""
"Specifies where to find and create tarballs, binary packages, source "
"packages, .changes files, and so on."
msgstr ""
#. type: Plain text
-#: ../dgit.1:105
1
+#: ../dgit.1:105
3
msgid "By default, dgit uses the parent directory (B<..>)."
msgstr ""
#. type: Plain text
msgid "By default, dgit uses the parent directory (B<..>)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:106
0
+#: ../dgit.1:106
2
msgid ""
"Changing this setting may necessitate moving .orig tarballs to the new "
"directory, so it is probably best to use the B<dgit.default.build-products-"
msgid ""
"Changing this setting may necessitate moving .orig tarballs to the new "
"directory, so it is probably best to use the B<dgit.default.build-products-"
@@
-1848,85
+1848,85
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:106
0
+#: ../dgit.1:106
2
#, no-wrap
msgid "B<--no-rm-on-error>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--no-rm-on-error>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:106
3
+#: ../dgit.1:106
5
msgid "Do not delete the destination directory if clone fails."
msgstr ""
#. type: TP
msgid "Do not delete the destination directory if clone fails."
msgstr ""
#. type: TP
-#: ../dgit.1:106
3
+#: ../dgit.1:106
5
#, no-wrap
msgid "B<--dep14tag>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:107
0
+#: ../dgit.1:107
2
msgid ""
"Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg "
"B<archive/debian/>I<version>). This is the default."
msgstr ""
#. type: TP
msgid ""
"Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg "
"B<archive/debian/>I<version>). This is the default."
msgstr ""
#. type: TP
-#: ../dgit.1:107
0
+#: ../dgit.1:107
2
#, no-wrap
msgid "B<--no-dep14tag>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--no-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:107
3
+#: ../dgit.1:107
5
msgid "Do not generate a DEP-14 tag, except when split view is in operation."
msgstr ""
#. type: TP
msgid "Do not generate a DEP-14 tag, except when split view is in operation."
msgstr ""
#. type: TP
-#: ../dgit.1:107
3
+#: ../dgit.1:107
5
#, no-wrap
msgid "B<--always-dep14tag>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--always-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:107
6
+#: ../dgit.1:107
8
msgid "Obsolete alias for --dep14tag, retained for compatibility."
msgstr ""
#. type: TP
msgid "Obsolete alias for --dep14tag, retained for compatibility."
msgstr ""
#. type: TP
-#: ../dgit.1:107
6
+#: ../dgit.1:107
8
#, no-wrap
msgid "B<-D>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-D>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:108
0
+#: ../dgit.1:108
2
msgid ""
"Prints debugging information to stderr. Repeating the option produces more "
"output (currently, up to -DDDD is meaningfully different)."
msgstr ""
#. type: TP
msgid ""
"Prints debugging information to stderr. Repeating the option produces more "
"output (currently, up to -DDDD is meaningfully different)."
msgstr ""
#. type: TP
-#: ../dgit.1:108
0
+#: ../dgit.1:108
2
#, no-wrap
msgid "B<-c>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-c>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:108
4
+#: ../dgit.1:108
6
msgid ""
"Specifies a git configuration option, to be used for this run. dgit itself "
"is also controlled by git configuration options."
msgstr ""
#. type: TP
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:108
4
+#: ../dgit.1:108
6
#, no-wrap
msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:109
3
+#: ../dgit.1:109
5
msgid ""
"Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during "
"builds. Changes (from debian/changelog) since this version will be included "
msgid ""
"Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during "
"builds. Changes (from debian/changelog) since this version will be included "
@@
-1936,7
+1936,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:1
099
+#: ../dgit.1:1
101
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 "
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 "
@@
-1944,30
+1944,30
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:1
099
+#: ../dgit.1:1
101
#, no-wrap
msgid "B<-m>I<maintaineraddress>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<-m>I<maintaineraddress>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:110
2
+#: ../dgit.1:110
4
msgid "Passed to dpkg-genchanges (eventually)."
msgstr ""
#. type: TP
msgid "Passed to dpkg-genchanges (eventually)."
msgstr ""
#. type: TP
-#: ../dgit.1:110
2
+#: ../dgit.1:110
4
#, no-wrap
msgid "B<--ch:>I<option>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--ch:>I<option>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:110
6
+#: ../dgit.1:110
8
msgid ""
"Specifies a single additional option to pass, eventually, to dpkg-genchanges."
msgstr ""
#. type: Plain text
msgid ""
"Specifies a single additional option to pass, eventually, to dpkg-genchanges."
msgstr ""
#. type: Plain text
-#: ../dgit.1:111
3
+#: ../dgit.1:111
5
msgid ""
"Options which are safe to pass include B<-C> (and also B<-si -sa -sd> "
"although these should never be necessary with Debian since dgit "
msgid ""
"Options which are safe to pass include B<-C> (and also B<-si -sa -sd> "
"although these should never be necessary with Debian since dgit "
@@
-1975,18
+1975,18
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:111
5
+#: ../dgit.1:111
7
msgid "For other options the caveat below applies."
msgstr ""
#. type: TP
msgid "For other options the caveat below applies."
msgstr ""
#. type: TP
-#: ../dgit.1:111
5
+#: ../dgit.1:111
7
#, no-wrap
msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:113
7
+#: ../dgit.1:113
9
msgid ""
"Specifies a single additional option to pass to B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgid ""
"Specifies a single additional option to pass to B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@
-1996,7
+1996,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:114
5
+#: ../dgit.1:114
7
msgid ""
"Use of this ability should not normally be necessary. It is provided for "
"working around bugs, or other unusual situations. If you use these options, "
msgid ""
"Use of this ability should not normally be necessary. It is provided for "
"working around bugs, or other unusual situations. If you use these options, "
@@
-2005,7
+2005,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:115
0
+#: ../dgit.1:115
2
msgid ""
"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
"applies only when the program is invoked directly by dgit. Usually, for "
msgid ""
"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
"applies only when the program is invoked directly by dgit. Usually, for "
@@
-2013,7
+2013,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:115
4
+#: ../dgit.1:115
6
msgid ""
"Specifying --git is not effective for some lower-level read-only git "
"operations performed by dgit, and also not when git is invoked by another "
msgid ""
"Specifying --git is not effective for some lower-level read-only git "
"operations performed by dgit, and also not when git is invoked by another "
@@
-2021,39
+2021,39
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:115
6
+#: ../dgit.1:115
8
msgid "See notes below regarding ssh and dgit."
msgstr ""
#. type: Plain text
msgid "See notes below regarding ssh and dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:116
4
+#: ../dgit.1:116
6
msgid ""
"NB that --gpg:option is not supported (because debsign does not have that "
"facility). But see B<-k> and the B<keyid> distro config setting."
msgstr ""
#. type: TP
msgid ""
"NB that --gpg:option is not supported (because debsign does not have that "
"facility). But see B<-k> and the B<keyid> distro config setting."
msgstr ""
#. type: TP
-#: ../dgit.1:116
4
+#: ../dgit.1:116
6
#, no-wrap
msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:117
0
+#: ../dgit.1:117
2
msgid ""
"Specifies an option to remove from the command line for a program called by "
"dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)."
msgstr ""
#. type: Plain text
msgid ""
"Specifies an option to remove from the command line for a program called by "
"dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:117
5
+#: ../dgit.1:117
7
msgid ""
"Any options or arguments exactly identical to I<option> are removed. (It is "
"not an error if there were none.)"
msgstr ""
#. type: Plain text
msgid ""
"Any options or arguments exactly identical to I<option> are removed. (It is "
"not an error if there were none.)"
msgstr ""
#. type: Plain text
-#: ../dgit.1:118
2
+#: ../dgit.1:118
4
msgid ""
"This can only be used to delete options which are always passed by default "
"by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be "
msgid ""
"This can only be used to delete options which are always passed by default "
"by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be "
@@
-2061,13
+2061,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:118
2
+#: ../dgit.1:118
4
#, no-wrap
msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:120
5
+#: ../dgit.1:120
7
msgid ""
"Specifies alternative programs to use instead of B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgid ""
"Specifies alternative programs to use instead of B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@
-2077,14
+2077,14
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:121
3
+#: ../dgit.1:121
5
msgid ""
"For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, "
"this applies only when the program is invoked directly by dgit."
msgstr ""
#. type: Plain text
msgid ""
"For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, "
"this applies only when the program is invoked directly by dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:122
0
+#: ../dgit.1:122
2
msgid ""
"For B<dgit>, specifies the command to run on the remote host when dgit rpush "
"needs to invoke a remote copy of itself. (dgit also reinvokes itself as the "
msgid ""
"For B<dgit>, specifies the command to run on the remote host when dgit rpush "
"needs to invoke a remote copy of itself. (dgit also reinvokes itself as the "
@@
-2093,7
+2093,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:123
1
+#: ../dgit.1:123
3
msgid ""
"B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The "
"default is the latter unless the former exists on PATH.) B<gbp-pq>'s value "
msgid ""
"B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The "
"default is the latter unless the former exists on PATH.) B<gbp-pq>'s value "
@@
-2103,7
+2103,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:12
39
+#: ../dgit.1:12
41
msgid ""
"For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo "
"-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified "
msgid ""
"For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo "
"-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified "
@@
-2111,7
+2111,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:125
6
+#: ../dgit.1:125
8
msgid ""
"For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> "
"environment variables, if set (see below). And, for ssh, when accessing the "
msgid ""
"For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> "
"environment variables, if set (see below). And, for ssh, when accessing the "
@@
-2123,13
+2123,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:125
6
+#: ../dgit.1:125
8
#, no-wrap
msgid "B<--existing-package=>I<package>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--existing-package=>I<package>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:126
6
+#: ../dgit.1:126
8
msgid ""
"dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way "
"to ask the archive to do this without knowing the name of an existing "
msgid ""
"dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way "
"to ask the archive to do this without knowing the name of an existing "
@@
-2140,19
+2140,19
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:126
6
+#: ../dgit.1:126
8
#, no-wrap
msgid "B<-h>|B<--help>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<-h>|B<--help>"
msgstr ""
#. type: TP
-#: ../dgit.1:12
69
+#: ../dgit.1:12
71
#, no-wrap
msgid "B<--initiator-tempdir=>I<directory>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--initiator-tempdir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:12
78
+#: ../dgit.1:12
80
msgid ""
"dgit rpush uses a temporary directory on the invoking (signing) host. This "
"option causes dgit to use I<directory> instead. Furthermore, the specified "
msgid ""
"dgit rpush uses a temporary directory on the invoking (signing) host. This "
"option causes dgit to use I<directory> instead. Furthermore, the specified "
@@
-2162,13
+2162,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:12
78
+#: ../dgit.1:12
80
#, no-wrap
msgid "B<--force->I<something>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:128
6
+#: ../dgit.1:128
8
msgid ""
"Instructs dgit to try to proceed despite detecting what it thinks is going "
"to be a fatal problem. B<This is probably not going to work.> These options "
msgid ""
"Instructs dgit to try to proceed despite detecting what it thinks is going "
"to be a fatal problem. B<This is probably not going to work.> These options "
@@
-2177,13
+2177,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:128
6
+#: ../dgit.1:128
8
#, no-wrap
msgid "B<--force-import-dsc-with-dgit-field>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-import-dsc-with-dgit-field>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:129
3
+#: ../dgit.1:129
5
msgid ""
"Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. "
"The result is a fresh import, discarding the git history that the person who "
msgid ""
"Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. "
"The result is a fresh import, discarding the git history that the person who "
@@
-2191,26
+2191,41
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:1293
+#: ../dgit.1:1295
+#, no-wrap
+msgid "B<--force-reusing-version>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1302
+msgid ""
+"Carry on even though this involves reusing a version number of a previous "
+"push or upload. It is normally best to give different versions different "
+"numbers. Some servers (including, usually, the Debian server) will reject "
+"attempts to reuse or replace already-pushed versions."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1302
#, no-wrap
msgid "B<--force-uploading-binaries>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-uploading-binaries>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1
298
+#: ../dgit.1:1
307
msgid ""
"Carry on and upload binaries even though dgit thinks your distro does not "
"permit that."
msgstr ""
#. type: TP
msgid ""
"Carry on and upload binaries even though dgit thinks your distro does not "
"permit that."
msgstr ""
#. type: TP
-#: ../dgit.1:1
298
+#: ../dgit.1:1
307
#, no-wrap
msgid "B<--force-uploading-source-only>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-uploading-source-only>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
04
+#: ../dgit.1:13
13
msgid ""
"Carry on and do a source-only upload, without any binaries, even though dgit "
"thinks your distro does not permit that, or does not permit that in this "
msgid ""
"Carry on and do a source-only upload, without any binaries, even though dgit "
"thinks your distro does not permit that, or does not permit that in this "
@@
-2218,13
+2233,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:13
04
+#: ../dgit.1:13
13
#, no-wrap
msgid "B<--force-unrepresentable>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-unrepresentable>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
11
+#: ../dgit.1:13
20
msgid ""
"Carry on even if dgit thinks that your git tree contains changes (relative "
"to your .orig tarballs) which dpkg-source is not able to represent. Your "
msgid ""
"Carry on even if dgit thinks that your git tree contains changes (relative "
"to your .orig tarballs) which dpkg-source is not able to represent. Your "
@@
-2232,65
+2247,65
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:13
11
+#: ../dgit.1:13
20
#, no-wrap
msgid "B<--force-changes-origs-exactly>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-changes-origs-exactly>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
16
+#: ../dgit.1:13
25
msgid ""
"Use the set of .origs specified in your .changes, exactly, without regard to "
"what is in the archive already. The archive may well reject your upload."
msgstr ""
#. type: TP
msgid ""
"Use the set of .origs specified in your .changes, exactly, without regard to "
"what is in the archive already. The archive may well reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:13
16
+#: ../dgit.1:13
25
#, no-wrap
msgid "B<--force-unsupported-source-format>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-unsupported-source-format>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:132
0
+#: ../dgit.1:132
9
msgid ""
"Carry on despite dgit not understanding your source package format. dgit "
"will probably mishandle it."
msgstr ""
#. type: TP
msgid ""
"Carry on despite dgit not understanding your source package format. dgit "
"will probably mishandle it."
msgstr ""
#. type: TP
-#: ../dgit.1:132
0
+#: ../dgit.1:132
9
#, no-wrap
msgid "B<--force-dsc-changes-mismatch>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-dsc-changes-mismatch>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
24
+#: ../dgit.1:13
33
msgid ""
"Do not check whether .dsc and .changes match. The archive will probably "
"reject your upload."
msgstr ""
#. type: TP
msgid ""
"Do not check whether .dsc and .changes match. The archive will probably "
"reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:13
24
+#: ../dgit.1:13
33
#, no-wrap
msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:133
0
+#: ../dgit.1:133
9
msgid ""
"Force on or off the use of the absurd git-apply emulation when running gbp "
"pq import when importing a package from a .dsc. See Debian bug #841867."
msgstr ""
#. type: TP
msgid ""
"Force on or off the use of the absurd git-apply emulation when running gbp "
"pq import when importing a package from a .dsc. See Debian bug #841867."
msgstr ""
#. type: TP
-#: ../dgit.1:133
0
+#: ../dgit.1:133
9
#, no-wrap
msgid "B<--for-push>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<--for-push>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
36
+#: ../dgit.1:13
45
msgid ""
"Override the dgit-distro.distro.readonly configuration setting, to specify "
"that we have read/write access and should use the corresponding git and "
msgid ""
"Override the dgit-distro.distro.readonly configuration setting, to specify "
"that we have read/write access and should use the corresponding git and "
@@
-2298,13
+2313,13
@@
msgid ""
msgstr ""
#. type: =head1
msgstr ""
#. type: =head1
-#: ../dgit.1:13
36
../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:13
45
../dgit-downstream-dsc.7.pod:150
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
42
+#: ../dgit.1:13
51
msgid ""
"dgit can be configured via the git config system. You may set keys with git-"
"config (either in system-global or per-tree configuration), or provide B<-"
msgid ""
"dgit can be configured via the git config system. You may set keys with git-"
"config (either in system-global or per-tree configuration), or provide B<-"
@@
-2312,31
+2327,31
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
44
+#: ../dgit.1:13
53
msgid "Settings likely to be useful for an end user include:"
msgstr ""
#. type: TP
msgid "Settings likely to be useful for an end user include:"
msgstr ""
#. type: TP
-#: ../dgit.1:13
44
+#: ../dgit.1:13
53
#, no-wrap
msgid "B<dgit.default.build-products-dir>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit.default.build-products-dir>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:135
0
+#: ../dgit.1:135
9
msgid ""
"Specifies where to find the built files to be uploaded, when --build-"
"products-dir is not specified. The default is the parent directory (B<..>)."
msgstr ""
#. type: =item
msgid ""
"Specifies where to find the built files to be uploaded, when --build-"
"products-dir is not specified. The default is the parent directory (B<..>)."
msgstr ""
#. type: =item
-#: ../dgit.1:135
0
../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:135
9
../dgit-downstream-dsc.7.pod:286
#, no-wrap
msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
55
+#: ../dgit.1:13
64
msgid ""
"Specifies the distro for a suite. dgit keys off the suite name (which "
"appears in changelogs etc.), and uses that to determine the distro which is "
msgid ""
"Specifies the distro for a suite. dgit keys off the suite name (which "
"appears in changelogs etc.), and uses that to determine the distro which is "
@@
-2344,66
+2359,73
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
58
+#: ../dgit.1:13
67
msgid "I<suite> may be a glob pattern."
msgstr ""
#. type: TP
msgid "I<suite> may be a glob pattern."
msgstr ""
#. type: TP
-#: ../dgit.1:13
58
+#: ../dgit.1:13
67
#, no-wrap
msgid "B<dgit.default.distro>I< distro>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit.default.distro>I< distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
61
+#: ../dgit.1:13
70
msgid "The default distro for an unknown suite."
msgstr ""
msgid "The default distro for an unknown suite."
msgstr ""
+#. type: Plain text
+#: ../dgit.1:1374
+msgid ""
+"This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> "
+"mentions the specified suite."
+msgstr ""
+
#. type: TP
#. type: TP
-#: ../dgit.1:13
61
+#: ../dgit.1:13
74
#, no-wrap
msgid "B<dgit.default.default-suite>I< suite>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit.default.default-suite>I< suite>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
64
+#: ../dgit.1:13
77
msgid "The default suite (eg for clone)."
msgstr ""
#. type: TP
msgid "The default suite (eg for clone)."
msgstr ""
#. type: TP
-#: ../dgit.1:13
64
+#: ../dgit.1:13
77
#, no-wrap
msgid "B<dgit.default.>*"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit.default.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
69
+#: ../dgit.1:13
82
msgid ""
"for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is "
"no distro-specific setting."
msgstr ""
#. type: TP
msgid ""
"for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is "
"no distro-specific setting."
msgstr ""
#. type: TP
-#: ../dgit.1:13
69
+#: ../dgit.1:13
82
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
73
+#: ../dgit.1:13
86
msgid ""
"One of the values for the command line --clean= option; used if --clean is "
"not specified."
msgstr ""
#. type: TP
msgid ""
"One of the values for the command line --clean= option; used if --clean is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:13
73
+#: ../dgit.1:13
86
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
79
+#: ../dgit.1:13
92
msgid ""
"Like .clean-mode, but ignored if the value is unknown to this version of "
"dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a "
msgid ""
"Like .clean-mode, but ignored if the value is unknown to this version of "
"dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a "
@@
-2411,45
+2433,45
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:13
79
+#: ../dgit.1:13
92
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:13
83
+#: ../dgit.1:13
96
msgid ""
"One of the values for the command line --quilt= option; used if --quilt is "
"not specified."
msgstr ""
#. type: TP
msgid ""
"One of the values for the command line --quilt= option; used if --quilt is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:13
83
+#: ../dgit.1:13
96
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.split-view>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.split-view>"
msgstr ""
#. type: TP
-#: ../dgit.1:13
85
+#: ../dgit.1:13
98
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1
389
+#: ../dgit.1:1
402
msgid ""
"Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is "
"specified. The default is not to remove."
msgstr ""
#. type: TP
msgid ""
"Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is "
"specified. The default is not to remove."
msgstr ""
#. type: TP
-#: ../dgit.1:1
389
+#: ../dgit.1:1
402
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1
396
+#: ../dgit.1:1
409
msgid ""
"Whether you have push access to the distro. For Debian, it is OK to use "
"auto, which uses readonly mode if you are not pushing right now; but, "
msgid ""
"Whether you have push access to the distro. For Debian, it is OK to use "
"auto, which uses readonly mode if you are not pushing right now; but, "
@@
-2458,52
+2480,52
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:1
396
+#: ../dgit.1:1
409
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.keyid>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.keyid>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
00
+#: ../dgit.1:14
13
msgid "See also B<-k>."
msgstr ""
#. type: TP
msgid "See also B<-k>."
msgstr ""
#. type: TP
-#: ../dgit.1:14
00
+#: ../dgit.1:14
13
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
02
+#: ../dgit.1:14
15
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.username>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.username>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
05
+#: ../dgit.1:14
18
msgid "Not relevant for Debian."
msgstr ""
#. type: =item
msgid "Not relevant for Debian."
msgstr ""
#. type: =item
-#: ../dgit.1:14
05
../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:14
18
../dgit-downstream-dsc.7.pod:242
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.upload-host>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.upload-host>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
08
+#: ../dgit.1:14
21
msgid "Might be useful if you have an intermediate queue server."
msgstr ""
#. type: TP
msgid "Might be useful if you have an intermediate queue server."
msgstr ""
#. type: TP
-#: ../dgit.1:14
08
+#: ../dgit.1:14
21
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
13
+#: ../dgit.1:14
26
msgid ""
"Values to configure for user.name and user.email in new git trees. If not "
"specified, the DEBFULLNAME and DEBEMAIL environment variables are used, "
msgid ""
"Values to configure for user.name and user.email in new git trees. If not "
"specified, the DEBFULLNAME and DEBEMAIL environment variables are used, "
@@
-2511,26
+2533,26
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:14
13
+#: ../dgit.1:14
26
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
17
+#: ../dgit.1:14
30
msgid ""
"Whether to set user.name and user.email in new git trees. True by default. "
"Ignored for dgit setup-useremail, which does it anyway."
msgstr ""
#. type: TP
msgid ""
"Whether to set user.name and user.email in new git trees. True by default. "
"Ignored for dgit setup-useremail, which does it anyway."
msgstr ""
#. type: TP
-#: ../dgit.1:14
17
+#: ../dgit.1:14
30
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
22
+#: ../dgit.1:14
35
msgid ""
"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
"changelog. True by default. Ignored for dgit setup-mergechangelogs, which "
msgid ""
"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
"changelog. True by default. Ignored for dgit setup-mergechangelogs, which "
@@
-2538,13
+2560,13
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:14
22
+#: ../dgit.1:14
35
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
28
+#: ../dgit.1:14
41
msgid ""
"Whether to configure .git/info/attributes to suppress checkin/checkout file "
"content transformations in new git trees. True by default. Ignored for "
msgid ""
"Whether to configure .git/info/attributes to suppress checkin/checkout file "
"content transformations in new git trees. True by default. Ignored for "
@@
-2552,24
+2574,24
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:14
28
+#: ../dgit.1:14
41
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
34
+#: ../dgit.1:14
47
msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ."
msgstr ""
#. type: TP
msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ."
msgstr ""
#. type: TP
-#: ../dgit.1:14
34
+#: ../dgit.1:14
47
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
46
+#: ../dgit.1:14
59
msgid ""
"Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass "
"several options, configure multiple values in git config (with git config --"
msgid ""
"Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass "
"several options, configure multiple values in git config (with git config --"
@@
-2579,13
+2601,13
@@
msgid ""
msgstr ""
#. type: SH
msgstr ""
#. type: SH
-#: ../dgit.1:14
46
+#: ../dgit.1:14
59
#, no-wrap
msgid "ACCESS CONFIGURATION"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "ACCESS CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
51
+#: ../dgit.1:14
64
msgid ""
"There are many other settings which specify how a particular distro's "
"services (archive and git) are provided. These should not normally be "
msgid ""
"There are many other settings which specify how a particular distro's "
"services (archive and git) are provided. These should not normally be "
@@
-2594,204
+2616,204
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:14
51
+#: ../dgit.1:14
64
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
54
+#: ../dgit.1:14
67
msgid "Shown in git tags, Dgit fields, and so on."
msgstr ""
#. type: TP
msgid "Shown in git tags, Dgit fields, and so on."
msgstr ""
#. type: TP
-#: ../dgit.1:14
54
+#: ../dgit.1:14
67
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
57
+#: ../dgit.1:14
70
msgid "Used for all access configuration lookup."
msgstr ""
#. type: TP
msgid "Used for all access configuration lookup."
msgstr ""
#. type: TP
-#: ../dgit.1:14
57
+#: ../dgit.1:14
70
#, no-wrap
msgid "B<dgit-distro.>I<distro>B</push.>*"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<dgit-distro.>I<distro>B</push.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:14
63
+#: ../dgit.1:14
76
msgid ""
"If set, overrides corresponding non B</push> config when B<readonly=false>, "
"or when pushing and B<readonly=auto>."
msgstr ""
#. type: TP
msgid ""
"If set, overrides corresponding non B</push> config when B<readonly=false>, "
"or when pushing and B<readonly=auto>."
msgstr ""
#. type: TP
-#: ../dgit.1:14
63
+#: ../dgit.1:14
76
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
65
+#: ../dgit.1:14
78
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
msgstr ""
#. type: TP
-#: ../dgit.1:14
67
+#: ../dgit.1:14
80
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-proto>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-proto>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
69
+#: ../dgit.1:14
82
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-path>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-path>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
71
+#: ../dgit.1:14
84
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
73
+#: ../dgit.1:14
86
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
75
+#: ../dgit.1:14
88
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
77
+#: ../dgit.1:14
90
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
79
+#: ../dgit.1:14
92
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
81
+#: ../dgit.1:14
94
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)"
msgstr ""
#. type: TP
-#: ../dgit.1:14
83
+#: ../dgit.1:14
96
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:14
85
+#: ../dgit.1:14
98
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
msgstr ""
#. type: TP
-#: ../dgit.1:1
487
+#: ../dgit.1:1
500
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
msgstr ""
#. type: TP
-#: ../dgit.1:1
489
+#: ../dgit.1:1
502
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1
491
+#: ../dgit.1:1
504
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.ssh>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.ssh>"
msgstr ""
#. type: TP
-#: ../dgit.1:1
493
+#: ../dgit.1:1
506
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
msgstr ""
#. type: TP
-#: ../dgit.1:1
495
+#: ../dgit.1:1
508
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)"
msgstr ""
#. type: TP
-#: ../dgit.1:1
497
+#: ../dgit.1:1
510
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
msgstr ""
#. type: TP
-#: ../dgit.1:1
499
+#: ../dgit.1:1
512
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
01
+#: ../dgit.1:15
14
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
03
+#: ../dgit.1:15
16
#, no-wrap
msgid "B<dgit.default.old-dsc-distro>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit.default.old-dsc-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
05
+#: ../dgit.1:15
18
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
07
+#: ../dgit.1:15
20
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
09
+#: ../dgit.1:15
22
#, no-wrap
msgid "B<dgit.default.dsc-url-proto-ok>"
msgstr ""
#. type: TP
#, no-wrap
msgid "B<dgit.default.dsc-url-proto-ok>"
msgstr ""
#. type: TP
-#: ../dgit.1:15
11
+#: ../dgit.1:15
24
#, no-wrap
msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
msgstr ""
#. type: SH
#, no-wrap
msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
msgstr ""
#. type: SH
-#: ../dgit.1:15
13
+#: ../dgit.1:15
26
#, no-wrap
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: TP
#, no-wrap
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: TP
-#: ../dgit.1:15
14
+#: ../dgit.1:15
27
#, no-wrap
msgid "B<DGIT_SSH>, B<GIT_SSH>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<DGIT_SSH>, B<GIT_SSH>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
23
+#: ../dgit.1:15
36
msgid ""
"specify an alternative default program (and perhaps arguments) to use "
"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if "
msgid ""
"specify an alternative default program (and perhaps arguments) to use "
"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if "
@@
-2801,26
+2823,26
@@
msgid ""
msgstr ""
#. type: TP
msgstr ""
#. type: TP
-#: ../dgit.1:15
23
+#: ../dgit.1:15
36
#, no-wrap
msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
27
+#: ../dgit.1:15
40
msgid ""
"Default git user.email and user.name for new trees. See B<dgit setup-new-"
"tree>."
msgstr ""
#. type: TP
msgid ""
"Default git user.email and user.name for new trees. See B<dgit setup-new-"
"tree>."
msgstr ""
#. type: TP
-#: ../dgit.1:15
27
+#: ../dgit.1:15
40
#, no-wrap
msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
32
+#: ../dgit.1:15
45
msgid ""
"and other subprograms and modules used by dgit are affected by various "
"environment variables. Consult the documentation for those programs for "
msgid ""
"and other subprograms and modules used by dgit are affected by various "
"environment variables. Consult the documentation for those programs for "
@@
-2828,13
+2850,13
@@
msgid ""
msgstr ""
#. type: SH
msgstr ""
#. type: SH
-#: ../dgit.1:15
32
+#: ../dgit.1:15
45
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
39
+#: ../dgit.1:15
52
msgid ""
"There should be a `dgit rebase-prep' command or some such to turn a fast-"
"forwarding branch containing pseudo-merges back into a rebasing patch "
msgid ""
"There should be a `dgit rebase-prep' command or some such to turn a fast-"
"forwarding branch containing pseudo-merges back into a rebasing patch "
@@
-2842,7
+2864,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
45
+#: ../dgit.1:15
58
msgid ""
"If the dgit push fails halfway through, it is not necessarily restartable "
"and idempotent. It would be good to check that the proposed signing key is "
msgid ""
"If the dgit push fails halfway through, it is not necessarily restartable "
"and idempotent. It would be good to check that the proposed signing key is "
@@
-2850,7
+2872,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
50
+#: ../dgit.1:15
63
msgid ""
"dgit's build functions, and dgit push, may make changes to your current "
"HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source "
msgid ""
"dgit's build functions, and dgit push, may make changes to your current "
"HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source "
@@
-2859,7
+2881,7
@@
msgid ""
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
55
+#: ../dgit.1:15
68
msgid ""
"--dry-run does not always work properly, as not doing some of the git "
"fetches may result in subsequent actions being different. Doing a non-dry-"
msgid ""
"--dry-run does not always work properly, as not doing some of the git "
"fetches may result in subsequent actions being different. Doing a non-dry-"
@@
-2867,7
+2889,7
@@
msgid ""
msgstr ""
#. type: =head1
msgstr ""
#. type: =head1
-#: ../dgit.1:15
55
../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:15
68
../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:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
@@
-2879,13
+2901,13
@@
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
64
+#: ../dgit.1:15
77
msgid ""
"B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-"
"config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1),"
msgstr ""
#. type: Plain text
msgid ""
"B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-"
"config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1),"
msgstr ""
#. type: Plain text
-#: ../dgit.1:15
65
+#: ../dgit.1:15
78
msgid "https://browse.dgit.debian.org/"
msgstr ""
msgid "https://browse.dgit.debian.org/"
msgstr ""
diff --git
a/po4a/git-debrebase_5.pot
b/po4a/git-debrebase_5.pot
index 91ac1c8cb765fa516e9a5ffce121a58e0b20cb22..238be6aa4fde5f3b8bdba56c28ca0f57df2a0516 100644
(file)
--- a/
po4a/git-debrebase_5.pot
+++ b/
po4a/git-debrebase_5.pot
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-0
8-10 19:42
+0100\n"
+"POT-Creation-Date: 2019-0
9-06 23:47
+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-28,7
+28,7
@@
msgid "NAME"
msgstr ""
#. type: =head1
msgstr ""
#. type: =head1
-#: ../dgit.1:15
55
../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:15
68
../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:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
@@
-914,7
+914,7
@@
msgid ""
"The full set of annotations is:\n"
" [git-debrebase split: mixed commit, debian part]\n"
" [git-debrebase split: mixed commit, upstream-part]\n"
"The full set of annotations is:\n"
" [git-debrebase split: mixed commit, debian part]\n"
" [git-debrebase split: mixed commit, upstream-part]\n"
-" [git-debrebase onvert dgit import: debian changes]\n"
+" [git-debrebase
c
onvert dgit import: debian changes]\n"
" [git-debrebase anchor: convert dgit import, upstream changes]\n"
"\n"
msgstr ""
" [git-debrebase anchor: convert dgit import, upstream changes]\n"
"\n"
msgstr ""
~ianmdlvl / dgit.git / commitdiff