msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
+"POT-Creation-Date: 2019-07-21 00:36+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:242
+#: ../dgit:264
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:249
+#: ../dgit:271
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:257
+#: ../dgit:279
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:262
+#: ../dgit:284
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:487
+#: ../dgit:516
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:492 ../dgit:498
+#: ../dgit:521 ../dgit:527
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:493
+#: ../dgit:522
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:501
+#: ../dgit:530
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:508
+#: ../dgit:537
msgid "protocol message"
msgstr ""
-#: ../dgit:516
+#: ../dgit:545
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:537
+#: ../dgit:566
msgid "bad byte count"
msgstr ""
-#: ../dgit:540
+#: ../dgit:569
msgid "data block"
msgstr ""
-#: ../dgit:621
+#: ../dgit:650
#, perl-format
msgid "failed to fetch %s: %s"
msgstr ""
-#: ../dgit:633
+#: ../dgit:662
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:635
+#: ../dgit:664
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:660
+#: ../dgit:689
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:679
+#: ../dgit:708
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:683
+#: ../dgit:712
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:688
+#: ../dgit:717
msgid "too few arguments"
msgstr ""
-#: ../dgit:799
+#: ../dgit:833
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:802
+#: ../dgit:836
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:822
+#: ../dgit:856
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:863
+#: ../dgit:897
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:878
+#: ../dgit:912
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:894
+#: ../dgit:928
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:914
+#: ../dgit:948
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:966
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206
msgid "internal error"
msgstr ""
-#: ../dgit:925
+#: ../dgit:973
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:929
+#: ../dgit:977
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:1094
+#: ../dgit:1000
+#, perl-format
+msgid ""
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
+msgstr ""
+
+#: ../dgit:1163
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:1140
+#: ../dgit:1209
#, perl-format
msgid ""
"config requested specific TLS key but do not know how to get curl to use "
"exactly that EE key (%s)"
msgstr ""
-#: ../dgit:1161
+#: ../dgit:1230
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
-#: ../dgit:1169
+#: ../dgit:1238
msgid "curl failed to print 3-digit HTTP code"
msgstr ""
-#: ../dgit:1173
+#: ../dgit:1242
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:1189
+#: ../dgit:1258
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:1193
+#: ../dgit:1262
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:1195
+#: ../dgit:1264
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:1197
+#: ../dgit:1266
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1268 ../dgit:1293
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1213
+#: ../dgit:1282
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1215
+#: ../dgit:1284
msgid "bad component"
msgstr ""
-#: ../dgit:1218
+#: ../dgit:1287
msgid "bad filename"
msgstr ""
-#: ../dgit:1220
+#: ../dgit:1289
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:1271
+#: ../dgit:1340
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:1355
+#: ../dgit:1424
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:1377
+#: ../dgit:1448
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:1405
+#: ../dgit:1474
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:1406
+#: ../dgit:1475
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1511
+#: ../dgit:1580
#, 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:1702
+#: ../dgit:1719
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:1705
+#: ../dgit:1722
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:1707
+#: ../dgit:1724
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:1727
+#: ../dgit:1744
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:1733
+#: ../dgit:1750
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1760
+#: ../dgit:1777
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:1777
+#: ../dgit:1794
msgid "unexpected results from git check query - "
msgstr ""
-#: ../dgit:1792
+#: ../dgit:1809
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:1807
+#: ../dgit:1824
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:1844
+#: ../dgit:1861
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:1890
+#: ../dgit:1907
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:1901
+#: ../dgit:1918
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:1947
+#: ../dgit:1964
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:1956
+#: ../dgit:1973
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:1960
+#: ../dgit:1977
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:1966
+#: ../dgit:1983
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:2006
+#: ../dgit:2023
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:2019
+#: ../dgit:2036
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:2032
+#: ../dgit:2049
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:2048
+#: ../dgit:2065
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:2053
+#: ../dgit:2070
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:2061
+#: ../dgit:2078
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2068
+#: ../dgit:2085
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:2096
+#: ../dgit:2113
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:2104
+#: ../dgit:2121
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:2107
+#: ../dgit:2124
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:2131
+#: ../dgit:2143
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:2154
+#: ../dgit:2166
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
"\n"
msgstr ""
-#: ../dgit:2166
+#: ../dgit:2178
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:2197
+#: ../dgit:2209
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:2199
+#: ../dgit:2211
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:2201
+#: ../dgit:2213
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2206
+#: ../dgit:2218
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:2231
+#: ../dgit:2243
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:2235
+#: ../dgit:2247
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:2237
+#: ../dgit:2249
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:2240
+#: ../dgit:2252
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:2249
+#: ../dgit:2261
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:2253
+#: ../dgit:2265
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:2256
+#: ../dgit:2268
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:2262
+#: ../dgit:2274
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2386
+#: ../dgit:2345
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2468
+#: ../dgit:2407
msgid "package changelog"
msgstr ""
-#: ../dgit:2508
+#: ../dgit:2447
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2527
+#: ../dgit:2516 ../dgit:2521
#, perl-format
-msgid "Import %s"
+msgid "accessing %s: %s"
msgstr ""
-#: ../dgit:2608
+#: ../dgit:2536 ../dgit:2543
+#, perl-format
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2569 ../dgit:6035
+msgid "source package"
+msgstr ""
+
+#: ../dgit:2647
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2627
+#: ../dgit:2666
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2636
+#: ../dgit:2675
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2651
+#: ../dgit:2690
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2655
+#: ../dgit:2694
msgid "Import of source package"
msgstr ""
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2672
+#: ../dgit:2714
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:2714
+#: ../dgit:2756
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2718
+#: ../dgit:2760
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2722
+#: ../dgit:2764
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2738
+#: ../dgit:2780
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2833
+#: ../dgit:2875
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2848
+#: ../dgit:2890
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2892
+#: ../dgit:2934
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2907
+#: ../dgit:2949
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:2912
+#: ../dgit:2954
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3063
+#: ../dgit:3101
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:3068
+#: ../dgit:3106
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:3073
+#: ../dgit:3111
#, 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:3083
+#: ../dgit:3121
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3103
+#: ../dgit:3141
msgid "rewrite map"
msgstr ""
-#: ../dgit:3110
+#: ../dgit:3148
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3114
+#: ../dgit:3152
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3116
+#: ../dgit:3154
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3123
+#: ../dgit:3161
msgid "additional commits"
msgstr ""
-#: ../dgit:3126
+#: ../dgit:3164
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3151
+#: ../dgit:3189
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3155
+#: ../dgit:3193
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3238
+#: ../dgit:3276
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3245
+#: ../dgit:3283
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3250
+#: ../dgit:3288
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3278
+#: ../dgit:3316
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3291
+#: ../dgit:3329
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3294
+#: ../dgit:3332
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3315
+#: ../dgit:3353
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3324
+#: ../dgit:3362
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3409
+#: ../dgit:3447
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
"Record that\n"
msgstr ""
-#: ../dgit:3422
+#: ../dgit:3460
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3440
+#: ../dgit:3478
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3442
+#: ../dgit:3480
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3453
+#: ../dgit:3491
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3468
+#: ../dgit:3506
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3504
+#: ../dgit:3542
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3569
+#: ../dgit:3607
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3583
+#: ../dgit:3621
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3598
+#: ../dgit:3636
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3625
+#: ../dgit:3663
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
"tree.\n"
msgstr ""
-#: ../dgit:3647
+#: ../dgit:3685
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3655
+#: ../dgit:3693
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3694
+#: ../dgit:3732
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3726
+#: ../dgit:3764
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3728
+#: ../dgit:3766
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3767
+#: ../dgit:3805
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
"Input branches:\n"
msgstr ""
-#: ../dgit:3781
+#: ../dgit:3819
msgid ""
"\n"
"Key\n"
"\n"
msgstr ""
-#: ../dgit:3796
+#: ../dgit:3834
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3814
+#: ../dgit:3852
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3822
+#: ../dgit:3860
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3837
+#: ../dgit:3875
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3853
+#: ../dgit:3891
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3857
+#: ../dgit:3895
msgid "starting new git history"
msgstr ""
-#: ../dgit:3883
+#: ../dgit:3921
#, 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:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3921
+#: ../dgit:3959
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3940
+#: ../dgit:3978
#, 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:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:4007
+#: ../dgit:4045
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:4012
+#: ../dgit:4050
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:4022
+#: ../dgit:4060
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:4028
+#: ../dgit:4066
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4054
+#: ../dgit:4092
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4057
+#: ../dgit:4095
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4065
+#: ../dgit:4103
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:4074
+#: ../dgit:4112
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4083
+#: ../dgit:4121
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4091
+#: ../dgit:4129
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4101
+#: ../dgit:4140
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4104
+#: ../dgit:4143
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4118
+#: ../dgit:4157
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4174
+#: ../dgit:4213
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4183
+#: ../dgit:4222
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4185
+#: ../dgit:4224
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4186
+#: ../dgit:4225
msgid "current archive contents"
msgstr ""
-#: ../dgit:4199
+#: ../dgit:4238
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4209
+#: ../dgit:4248
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4210
+#: ../dgit:4249
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4214
+#: ../dgit:4253
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4227
+#: ../dgit:4266
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4235
+#: ../dgit:4274
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4247
+#: ../dgit:4286
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4269
+#: ../dgit:4308
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4330
+#: ../dgit:4362
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5499
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5565
+#: ../dgit:5607
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5583
+#: ../dgit:5625
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5592
+#: ../dgit:5634
msgid "root commit"
msgstr ""
-#: ../dgit:5598
+#: ../dgit:5640
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5610
+#: ../dgit:5652
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5629
+#: ../dgit:5671
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5636
+#: ../dgit:5678
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5648
+#: ../dgit:5690
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5651
+#: ../dgit:5693
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5663
+#: ../dgit:5705
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
"\n"
msgstr ""
-#: ../dgit:5670
+#: ../dgit:5712
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5704
+#: ../dgit:5746
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5705
+#: ../dgit:5747
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5706
+#: ../dgit:5748
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5707
+#: ../dgit:5749
msgid "is series file\n"
msgstr ""
-#: ../dgit:5708
+#: ../dgit:5750
msgid "too long\n"
msgstr ""
-#: ../dgit:5712
+#: ../dgit:5754
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5741
+#: ../dgit:5783
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
+#: ../dgit:5866
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
#: ../dgit:5884
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5885
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5939
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5894
+#: ../dgit:5949
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5996
+#: ../dgit:6059
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6027
+#: ../dgit:6091
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6032
+#: ../dgit:6096
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:6043
+#: ../dgit:6131
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6134
+#: ../dgit:6245
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"
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6148
+#: ../dgit:6259
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6185
+#: ../dgit:6293
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6306
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6324
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6340
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6354
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6378
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6188
+#: ../dgit:6388
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6194
+#: ../dgit:6397
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6198
+#: ../dgit:6401
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6205
+#: ../dgit:6408
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6412
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6208
+#: ../dgit:6415
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6211
+#: ../dgit:6418
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6214
+#: ../dgit:6421
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6218
+#: ../dgit:6425
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6227
+#: ../dgit:6436
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6265
+#: ../dgit:6475
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
"\n"
msgstr ""
-#: ../dgit:6277
+#: ../dgit:6487
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6306
+#: ../dgit:6516
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:6318
+#: ../dgit:6528
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6321
+#: ../dgit:6531
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6324
+#: ../dgit:6534
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:6342
+#: ../dgit:6547
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6564
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6356
+#: ../dgit:6578
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6369
+#: ../dgit:6597
#, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "-p specified package %s, but changelog says %s"
msgstr ""
-#: ../dgit:6408
+#: ../dgit:6607
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6616
+#, perl-format
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6620
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6655
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6410
+#: ../dgit:6657
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6436
+#: ../dgit:6683
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6689
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6445
+#: ../dgit:6692
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6488
+#: ../dgit:6735
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6526
+#: ../dgit:6773
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6533
+#: ../dgit:6780
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6540
+#: ../dgit:6787
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6544
+#: ../dgit:6791
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6549
+#: ../dgit:6796
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6552
+#: ../dgit:6799
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6565
+#: ../dgit:6812
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6583
+#: ../dgit:6830
msgid "build successful\n"
msgstr ""
-#: ../dgit:6590
+#: ../dgit:6837
#, 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:6700
+#: ../dgit:6947
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6735
+#: ../dgit:6984
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6755
+#: ../dgit:7004
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6768
+#: ../dgit:7017
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6772
+#: ../dgit:7021
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6779
+#: ../dgit:7028
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6785
+#: ../dgit:7034
msgid "source changes file"
msgstr ""
-#: ../dgit:6787
+#: ../dgit:7036
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7056 ../dgit:7058
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6822
+#: ../dgit:7071
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:6834
+#: ../dgit:7083
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6838
+#: ../dgit:7087
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:6868
+#: ../dgit:7117
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6890
+#: ../dgit:7138
msgid "source tree"
msgstr ""
-#: ../dgit:6892
+#: ../dgit:7140
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6905
+#: ../dgit:7153
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6909
+#: ../dgit:7157
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6913
+#: ../dgit:7161
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6930
+#: ../dgit:7178
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6935
+#: ../dgit:7183
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6937
+#: ../dgit:7185
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7196
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6951
+#: ../dgit:7199
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6962
+#: ../dgit:7210
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6973
+#: ../dgit:7221
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6982
+#: ../dgit:7230
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6989
+#: ../dgit:7237
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6991
+#: ../dgit:7239
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6996
+#: ../dgit:7244
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7001
+#: ../dgit:7249
#, perl-format
msgid ""
"Branch %s already exists\n"
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7021
+#: ../dgit:7269
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7023
+#: ../dgit:7271
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7031
+#: ../dgit:7279
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:7050
+#: ../dgit:7298
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:7054
+#: ../dgit:7302
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:7055
+#: ../dgit:7303
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:7066
+#: ../dgit:7314
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:7068
+#: ../dgit:7316
msgid "Import, merging."
msgstr ""
-#: ../dgit:7082
+#: ../dgit:7330
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7091
+#: ../dgit:7339
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7098
+#: ../dgit:7346
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7104
+#: ../dgit:7352
#, perl-format
msgid "exec curl: %s\n"
msgstr ""
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr ""
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7131
+#: ../dgit:7379
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7368
+#: ../dgit:7620
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7423
+#: ../dgit:7675
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7438
+#: ../dgit:7690
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7442
+#: ../dgit:7694
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7448
+#: ../dgit:7700
#, perl-format
msgid ""
"On entry to dgit, %s\n"
"Giving up.\n"
msgstr ""
-#: ../dgit:7465
+#: ../dgit:7717
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7478
+#: ../dgit:7730
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7498
+#: ../dgit:7750
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7508
+#: ../dgit:7761
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7545
+#: ../dgit:7789
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7546
+#: ../dgit:7790
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7565
+#: ../dgit:7809
#, perl-format
msgid "unknown operation %s"
msgstr ""
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr ""
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr ""
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr ""
-#: ../git-debrebase:401
+#: ../git-debrebase:364
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:404
+#: ../git-debrebase:367
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:417
+#: ../git-debrebase:380
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
-#: ../git-debrebase:423
+#: ../git-debrebase:386
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr ""
-#: ../git-debrebase:427
+#: ../git-debrebase:390
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
-#: ../git-debrebase:459
+#: ../git-debrebase:422
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
msgstr ""
-#: ../git-debrebase:466
+#: ../git-debrebase:429
#, perl-format
msgid ""
"%s\n"
"Is this meant to be a gdr branch? %s\n"
msgstr ""
-#: ../git-debrebase:471
+#: ../git-debrebase:434
#, perl-format
msgid ""
"%s\n"
"Consider git-debrebase scrap, to throw away your recent work.\n"
msgstr ""
-#: ../git-debrebase:477
+#: ../git-debrebase:440
#, perl-format
msgid ""
"%s\n"
"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
msgstr ""
-#: ../git-debrebase:488
+#: ../git-debrebase:451
#, perl-format
msgid ""
"%s\n"
"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
msgstr ""
-#: ../git-debrebase:935
+#: ../git-debrebase:898
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr ""
-#: ../git-debrebase:937
+#: ../git-debrebase:900
msgid "has other than two parents"
msgstr ""
-#: ../git-debrebase:938
+#: ../git-debrebase:901
msgid "contains debian/patches"
msgstr ""
-#: ../git-debrebase:964
+#: ../git-debrebase:927
msgid "is an origin commit"
msgstr ""
-#: ../git-debrebase:966
+#: ../git-debrebase:929
msgid "upstream files differ from left parent"
msgstr ""
-#: ../git-debrebase:968
+#: ../git-debrebase:931
msgid "debian/ differs from right parent"
msgstr ""
-#: ../git-debrebase:979
+#: ../git-debrebase:942
msgid "edits debian/patches"
msgstr ""
-#: ../git-debrebase:991
+#: ../git-debrebase:954
msgid "parent's debian is not a directory"
msgstr ""
-#: ../git-debrebase:998
+#: ../git-debrebase:961
msgid "no changes"
msgstr ""
-#: ../git-debrebase:1004
+#: ../git-debrebase:967
msgid "origin commit"
msgstr ""
-#: ../git-debrebase:1055
+#: ../git-debrebase:1018
#, perl-format
msgid "unknown kind of merge from %s"
msgstr ""
-#: ../git-debrebase:1058
+#: ../git-debrebase:1021
msgid "octopus merge"
msgstr ""
-#: ../git-debrebase:1062
+#: ../git-debrebase:1025
msgid "general two-parent merge"
msgstr ""
-#: ../git-debrebase:1079
+#: ../git-debrebase:1042
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr ""
-#: ../git-debrebase:1119
+#: ../git-debrebase:1082
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr ""
-#: ../git-debrebase:1147
+#: ../git-debrebase:1110
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr ""
-#: ../git-debrebase:1148
+#: ../git-debrebase:1111
#, perl-format
msgid " (eg %s)"
msgstr ""
-#: ../git-debrebase:1154
+#: ../git-debrebase:1117
msgid "found mixed upstream/packaging commit"
msgstr ""
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131
+#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150
#, perl-format
msgid " (%s)"
msgstr ""
-#: ../git-debrebase:1162
+#: ../git-debrebase:1125
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr ""
-#: ../git-debrebase:1167
+#: ../git-debrebase:1130
msgid "found dgit dsc import"
msgstr ""
-#: ../git-debrebase:1172
+#: ../git-debrebase:1135
msgid "found bare dgit dsc import with no prior history"
msgstr ""
-#: ../git-debrebase:1178
+#: ../git-debrebase:1141
msgid "found vanilla merge"
msgstr ""
-#: ../git-debrebase:1185
+#: ../git-debrebase:1148
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr ""
-#: ../git-debrebase:1253
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1254
+#: ../git-debrebase:1217
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1375
+#: ../git-debrebase:1338
msgid "bare dgit dsc import"
msgstr ""
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1678 ../git-debrebase:1681
#, perl-format
msgid "mismatch %s ?"
msgstr ""
-#: ../git-debrebase:1721
+#: ../git-debrebase:1684
#, perl-format
msgid "mismatch %s != %s ?"
msgstr ""
-#: ../git-debrebase:1731
+#: ../git-debrebase:1694
#, perl-format
msgid "internal error %#x %s %s"
msgstr ""
-#: ../git-debrebase:1759
+#: ../git-debrebase:1722
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr ""
-#: ../git-debrebase:1773
+#: ../git-debrebase:1736
msgid "you are in the middle of a git-rebase already"
msgstr ""
-#: ../git-debrebase:1799
+#: ../git-debrebase:1762
msgid "launder for rebase"
msgstr ""
-#: ../git-debrebase:1804
+#: ../git-debrebase:1767
msgid "analyse does not support any options"
msgstr ""
-#: ../git-debrebase:1806
+#: ../git-debrebase:1769
msgid "too many arguments to analyse"
msgstr ""
-#: ../git-debrebase:1841
+#: ../git-debrebase:1802
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1804
msgid "HEAD symref is not to refs/heads/"
msgstr ""
-#: ../git-debrebase:1864
+#: ../git-debrebase:1827
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr ""
-#: ../git-debrebase:1868
+#: ../git-debrebase:1831
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr ""
-#: ../git-debrebase:1872
+#: ../git-debrebase:1835
#, perl-format
msgid "you have diverged from %s"
msgstr ""
-#: ../git-debrebase:1894
+#: ../git-debrebase:1857
msgid "remote dgit branch"
msgstr ""
-#: ../git-debrebase:1897
+#: ../git-debrebase:1860
msgid "remote dgit branch for sid"
msgstr ""
-#: ../git-debrebase:1925
+#: ../git-debrebase:1888
msgid "Recorded previous head for preservation"
msgstr ""
-#: ../git-debrebase:1933
+#: ../git-debrebase:1896
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1944
+#: ../git-debrebase:1907
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1964
+#: ../git-debrebase:1927
msgid "fast forward"
msgstr ""
-#: ../git-debrebase:1974
+#: ../git-debrebase:1937
msgid "Declare fast forward / record previous work"
msgstr ""
-#: ../git-debrebase:1986
+#: ../git-debrebase:1949
msgid "No ffq-prev to stitch."
msgstr ""
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1966
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr ""
-#: ../git-debrebase:2041
+#: ../git-debrebase:1971
#, perl-format
msgid "bad version number `%s'"
msgstr ""
-#: ../git-debrebase:2059
+#: ../git-debrebase:1989
#, perl-format
msgid "upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2060
+#: ../git-debrebase:1990
msgid "upstream (main piece"
msgstr ""
-#: ../git-debrebase:2080
+#: ../git-debrebase:2010
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr ""
-#: ../git-debrebase:2098
+#: ../git-debrebase:2028
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr "old anchor is recognized due to --anchor, cannot check upstream"
-#: ../git-debrebase:2114
+#: ../git-debrebase:2044
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"but has %d parents (one per piece plus maybe a previous combine)"
msgstr ""
-#: ../git-debrebase:2123
+#: ../git-debrebase:2053
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
-#: ../git-debrebase:2136
+#: ../git-debrebase:2066
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"commit"
msgstr ""
-#: ../git-debrebase:2147
+#: ../git-debrebase:2077
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2150
+#: ../git-debrebase:2080
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2153
+#: ../git-debrebase:2083
#, perl-format
msgid "not fast forward: %s %s"
msgstr ""
-#: ../git-debrebase:2264
+#: ../git-debrebase:2194
msgid "Previous head already recorded\n"
msgstr ""
-#: ../git-debrebase:2268
+#: ../git-debrebase:2198
#, perl-format
msgid "Could not preserve: %s"
msgstr ""
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215
+#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338
+#: ../git-debrebase:2402
msgid "no arguments allowed"
msgstr ""
-#: ../git-debrebase:2307
+#: ../git-debrebase:2237
msgid "branch contains furniture (not laundered)"
msgstr ""
-#: ../git-debrebase:2308
+#: ../git-debrebase:2238
msgid "branch is unlaundered"
msgstr ""
-#: ../git-debrebase:2309
+#: ../git-debrebase:2239
msgid "branch needs laundering"
msgstr ""
-#: ../git-debrebase:2310
+#: ../git-debrebase:2240
msgid "branch not in git-debrebase form"
msgstr ""
-#: ../git-debrebase:2320
+#: ../git-debrebase:2250
msgid "current branch contents, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2322
+#: ../git-debrebase:2252
msgid " branch is laundered\n"
msgstr ""
-#: ../git-debrebase:2338
+#: ../git-debrebase:2268
#, perl-format
msgid " %s is not well-defined\n"
msgstr ""
-#: ../git-debrebase:2344
+#: ../git-debrebase:2274
msgid "key git-debrebase commits:\n"
msgstr ""
-#: ../git-debrebase:2345
+#: ../git-debrebase:2275
msgid "anchor"
msgstr ""
-#: ../git-debrebase:2346
+#: ../git-debrebase:2276
msgid "breakwater"
msgstr ""
-#: ../git-debrebase:2351
+#: ../git-debrebase:2281
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2358
+#: ../git-debrebase:2288
msgid " unstitched; previous tip was:\n"
msgstr ""
-#: ../git-debrebase:2361
+#: ../git-debrebase:2291
msgid " stitched? (no record of git-debrebase work)\n"
msgstr ""
-#: ../git-debrebase:2363
+#: ../git-debrebase:2293
msgid " stitched\n"
msgstr ""
-#: ../git-debrebase:2365
+#: ../git-debrebase:2295
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr ""
-#: ../git-debrebase:2368
+#: ../git-debrebase:2298
msgid "you are currently rebasing\n"
msgstr ""
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2315 ../git-debrebase:2328
msgid "launder for git-debrebase quick"
msgstr ""
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2322 ../git-debrebase:2352
msgid "No ongoing git-debrebase session."
msgstr ""
-#: ../git-debrebase:2461
+#: ../git-debrebase:2391
msgid "Commit patch queue (exported by git-debrebase)"
msgstr ""
-#: ../git-debrebase:2478
+#: ../git-debrebase:2408
msgid "No (more) patches to export."
msgstr ""
-#: ../git-debrebase:2485
+#: ../git-debrebase:2415
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"laundering first."
msgstr ""
-#: ../git-debrebase:2505
+#: ../git-debrebase:2435
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr ""
-#: ../git-debrebase:2510
+#: ../git-debrebase:2440
#, perl-format
msgid "patch %s repeated in %s !"
msgstr ""
-#: ../git-debrebase:2517
+#: ../git-debrebase:2447
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr ""
-#: ../git-debrebase:2525
+#: ../git-debrebase:2455
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2530
+#: ../git-debrebase:2460
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2546
+#: ../git-debrebase:2476
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2551
+#: ../git-debrebase:2481
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2567
+#: ../git-debrebase:2497
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2575
+#: ../git-debrebase:2505
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2582
+#: ../git-debrebase:2512
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"files - are you sure this is a gbp (patches-unapplied) branch?"
msgstr ""
-#: ../git-debrebase:2584
+#: ../git-debrebase:2514
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2591
+#: ../git-debrebase:2521
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2609
+#: ../git-debrebase:2539
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2615
+#: ../git-debrebase:2545
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2618
+#: ../git-debrebase:2548
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2621
+#: ../git-debrebase:2551
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2623
+#: ../git-debrebase:2553
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2625
+#: ../git-debrebase:2555
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2632
+#: ../git-debrebase:2562
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2678
+#: ../git-debrebase:2608
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2707
+#: ../git-debrebase:2637
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2728
+#: ../git-debrebase:2658
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2736
+#: ../git-debrebase:2666
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2750
+#: ../git-debrebase:2680
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2754
+#: ../git-debrebase:2684
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2766
+#: ../git-debrebase:2696
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2773
+#: ../git-debrebase:2703
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2779
+#: ../git-debrebase:2709
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2788
+#: ../git-debrebase:2718
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2794
+#: ../git-debrebase:2724
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2825
+#: ../git-debrebase:2755
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2834
+#: ../git-debrebase:2764
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2871
+#: ../git-debrebase:2801
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2880
+#: ../git-debrebase:2810
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2894
+#: ../git-debrebase:2824
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"upstream commmit explicitly or provide suitable origs.\n"
msgstr ""
-#: ../git-debrebase:2900
+#: ../git-debrebase:2830
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2907
+#: ../git-debrebase:2837
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2911
+#: ../git-debrebase:2841
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3013
+#: ../git-debrebase:2943
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3023
+#: ../git-debrebase:2953
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3053
+#: ../git-debrebase:2983
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:293
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:319
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:338
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:340
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:347
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:353
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:359
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:361
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:363
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:454
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:464
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:483
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:489
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:510
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:513
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:621
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:622
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:644
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:650
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:764
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:765
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:781
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:790
#, 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:729
+#: ../Debian/Dgit.pm:804
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:825
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:911
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:932
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1000
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1023
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1031
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1040
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
#, fuzzy
msgid ""
msgstr ""
-"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n"
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n"
-"Project-Id-Version: dgit ongoing\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n"
-"Project-Id-Version: dgit ongoing\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 15:31+0000\n"
+"POT-Creation-Date: 2019-07-21 00:36+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:242
+#: ../dgit:264
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:249
+#: ../dgit:271
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:257
+#: ../dgit:279
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:262
+#: ../dgit:284
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:487
+#: ../dgit:516
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:492 ../dgit:498
+#: ../dgit:521 ../dgit:527
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:493
+#: ../dgit:522
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:501
+#: ../dgit:530
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:508
+#: ../dgit:537
msgid "protocol message"
msgstr ""
-#: ../dgit:516
+#: ../dgit:545
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:537
+#: ../dgit:566
msgid "bad byte count"
msgstr ""
-#: ../dgit:540
+#: ../dgit:569
msgid "data block"
msgstr ""
-#: ../dgit:621
+#: ../dgit:650
#, perl-format
msgid "failed to fetch %s: %s"
msgstr ""
-#: ../dgit:633
+#: ../dgit:662
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:635
+#: ../dgit:664
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:660
+#: ../dgit:689
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:679
+#: ../dgit:708
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:683
+#: ../dgit:712
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:688
+#: ../dgit:717
msgid "too few arguments"
msgstr ""
-#: ../dgit:799
+#: ../dgit:833
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:802
+#: ../dgit:836
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:822
+#: ../dgit:856
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:863
+#: ../dgit:897
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:878
+#: ../dgit:912
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:894
+#: ../dgit:928
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:914
+#: ../dgit:948
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:966
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206
msgid "internal error"
msgstr ""
-#: ../dgit:925
+#: ../dgit:973
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:929
+#: ../dgit:977
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:1094
+#: ../dgit:1000
+#, perl-format
+msgid ""
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
+msgstr ""
+
+#: ../dgit:1163
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:1140
+#: ../dgit:1209
#, perl-format
msgid ""
"config requested specific TLS key but do not know how to get curl to use "
"exactly that EE key (%s)"
msgstr ""
-#: ../dgit:1161
+#: ../dgit:1230
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
-#: ../dgit:1169
+#: ../dgit:1238
msgid "curl failed to print 3-digit HTTP code"
msgstr ""
-#: ../dgit:1173
+#: ../dgit:1242
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:1189
+#: ../dgit:1258
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:1193
+#: ../dgit:1262
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:1195
+#: ../dgit:1264
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:1197
+#: ../dgit:1266
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1268 ../dgit:1293
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1213
+#: ../dgit:1282
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1215
+#: ../dgit:1284
msgid "bad component"
msgstr ""
-#: ../dgit:1218
+#: ../dgit:1287
msgid "bad filename"
msgstr ""
-#: ../dgit:1220
+#: ../dgit:1289
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:1271
+#: ../dgit:1340
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:1355
+#: ../dgit:1424
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:1377
+#: ../dgit:1448
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:1405
+#: ../dgit:1474
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:1406
+#: ../dgit:1475
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1511
+#: ../dgit:1580
#, 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:1702
+#: ../dgit:1719
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:1705
+#: ../dgit:1722
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:1707
+#: ../dgit:1724
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:1727
+#: ../dgit:1744
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:1733
+#: ../dgit:1750
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1760
+#: ../dgit:1777
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:1777
+#: ../dgit:1794
msgid "unexpected results from git check query - "
msgstr ""
-#: ../dgit:1792
+#: ../dgit:1809
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:1807
+#: ../dgit:1824
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:1844
+#: ../dgit:1861
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:1890
+#: ../dgit:1907
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:1901
+#: ../dgit:1918
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:1947
+#: ../dgit:1964
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:1956
+#: ../dgit:1973
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:1960
+#: ../dgit:1977
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:1966
+#: ../dgit:1983
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:2006
+#: ../dgit:2023
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:2019
+#: ../dgit:2036
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:2032
+#: ../dgit:2049
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:2048
+#: ../dgit:2065
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:2053
+#: ../dgit:2070
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:2061
+#: ../dgit:2078
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2068
+#: ../dgit:2085
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:2096
+#: ../dgit:2113
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:2104
+#: ../dgit:2121
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:2107
+#: ../dgit:2124
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:2131
+#: ../dgit:2143
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:2154
+#: ../dgit:2166
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
"\n"
msgstr ""
-#: ../dgit:2166
+#: ../dgit:2178
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:2197
+#: ../dgit:2209
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:2199
+#: ../dgit:2211
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:2201
+#: ../dgit:2213
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2206
+#: ../dgit:2218
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:2231
+#: ../dgit:2243
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:2235
+#: ../dgit:2247
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:2237
+#: ../dgit:2249
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:2240
+#: ../dgit:2252
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:2249
+#: ../dgit:2261
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:2253
+#: ../dgit:2265
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:2256
+#: ../dgit:2268
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:2262
+#: ../dgit:2274
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2386
+#: ../dgit:2345
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2468
+#: ../dgit:2407
msgid "package changelog"
msgstr ""
-#: ../dgit:2508
+#: ../dgit:2447
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2527
+#: ../dgit:2516 ../dgit:2521
#, perl-format
-msgid "Import %s"
+msgid "accessing %s: %s"
msgstr ""
-#: ../dgit:2608
+#: ../dgit:2536 ../dgit:2543
+#, perl-format
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2569 ../dgit:6035
+msgid "source package"
+msgstr ""
+
+#: ../dgit:2647
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2627
+#: ../dgit:2666
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2636
+#: ../dgit:2675
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2651
+#: ../dgit:2690
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2655
+#: ../dgit:2694
msgid "Import of source package"
msgstr ""
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2672
+#: ../dgit:2714
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:2714
+#: ../dgit:2756
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2718
+#: ../dgit:2760
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2722
+#: ../dgit:2764
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2738
+#: ../dgit:2780
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2833
+#: ../dgit:2875
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2848
+#: ../dgit:2890
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2892
+#: ../dgit:2934
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2907
+#: ../dgit:2949
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:2912
+#: ../dgit:2954
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3063
+#: ../dgit:3101
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:3068
+#: ../dgit:3106
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:3073
+#: ../dgit:3111
#, 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:3083
+#: ../dgit:3121
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3103
+#: ../dgit:3141
msgid "rewrite map"
msgstr ""
-#: ../dgit:3110
+#: ../dgit:3148
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3114
+#: ../dgit:3152
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3116
+#: ../dgit:3154
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3123
+#: ../dgit:3161
msgid "additional commits"
msgstr ""
-#: ../dgit:3126
+#: ../dgit:3164
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3151
+#: ../dgit:3189
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3155
+#: ../dgit:3193
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3238
+#: ../dgit:3276
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3245
+#: ../dgit:3283
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3250
+#: ../dgit:3288
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3278
+#: ../dgit:3316
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3291
+#: ../dgit:3329
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3294
+#: ../dgit:3332
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3315
+#: ../dgit:3353
#, perl-format
msgid ""
"\n"
"%s\n"
msgstr ""
-#: ../dgit:3324
+#: ../dgit:3362
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3409
+#: ../dgit:3447
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
"Record that\n"
msgstr ""
-#: ../dgit:3422
+#: ../dgit:3460
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3440
+#: ../dgit:3478
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3442
+#: ../dgit:3480
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3453
+#: ../dgit:3491
#, perl-format
msgid ""
"\n"
"\n"
msgstr ""
-#: ../dgit:3468
+#: ../dgit:3506
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3504
+#: ../dgit:3542
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3569
+#: ../dgit:3607
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3583
+#: ../dgit:3621
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3598
+#: ../dgit:3636
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3625
+#: ../dgit:3663
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
"tree.\n"
msgstr ""
-#: ../dgit:3647
+#: ../dgit:3685
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3655
+#: ../dgit:3693
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3694
+#: ../dgit:3732
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3726
+#: ../dgit:3764
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3728
+#: ../dgit:3766
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3767
+#: ../dgit:3805
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
"Input branches:\n"
msgstr ""
-#: ../dgit:3781
+#: ../dgit:3819
msgid ""
"\n"
"Key\n"
"\n"
msgstr ""
-#: ../dgit:3796
+#: ../dgit:3834
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3814
+#: ../dgit:3852
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3822
+#: ../dgit:3860
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3837
+#: ../dgit:3875
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3853
+#: ../dgit:3891
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3857
+#: ../dgit:3895
msgid "starting new git history"
msgstr ""
-#: ../dgit:3883
+#: ../dgit:3921
#, 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:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3921
+#: ../dgit:3959
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3940
+#: ../dgit:3978
#, 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:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:4007
+#: ../dgit:4045
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:4012
+#: ../dgit:4050
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:4022
+#: ../dgit:4060
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:4028
+#: ../dgit:4066
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4054
+#: ../dgit:4092
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4057
+#: ../dgit:4095
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4065
+#: ../dgit:4103
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:4074
+#: ../dgit:4112
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4083
+#: ../dgit:4121
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4091
+#: ../dgit:4129
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4101
+#: ../dgit:4140
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4104
+#: ../dgit:4143
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4118
+#: ../dgit:4157
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4174
+#: ../dgit:4213
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4183
+#: ../dgit:4222
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4185
+#: ../dgit:4224
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4186
+#: ../dgit:4225
msgid "current archive contents"
msgstr ""
-#: ../dgit:4199
+#: ../dgit:4238
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4209
+#: ../dgit:4248
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4210
+#: ../dgit:4249
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4214
+#: ../dgit:4253
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4227
+#: ../dgit:4266
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4235
+#: ../dgit:4274
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4247
+#: ../dgit:4286
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4269
+#: ../dgit:4308
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4330
+#: ../dgit:4362
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5499
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5565
+#: ../dgit:5607
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5583
+#: ../dgit:5625
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5592
+#: ../dgit:5634
msgid "root commit"
msgstr ""
-#: ../dgit:5598
+#: ../dgit:5640
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5610
+#: ../dgit:5652
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5629
+#: ../dgit:5671
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5636
+#: ../dgit:5678
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5648
+#: ../dgit:5690
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5651
+#: ../dgit:5693
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5663
+#: ../dgit:5705
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
"\n"
msgstr ""
-#: ../dgit:5670
+#: ../dgit:5712
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5704
+#: ../dgit:5746
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5705
+#: ../dgit:5747
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5706
+#: ../dgit:5748
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5707
+#: ../dgit:5749
msgid "is series file\n"
msgstr ""
-#: ../dgit:5708
+#: ../dgit:5750
msgid "too long\n"
msgstr ""
-#: ../dgit:5712
+#: ../dgit:5754
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5741
+#: ../dgit:5783
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
+#: ../dgit:5866
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
#: ../dgit:5884
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5885
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5939
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5894
+#: ../dgit:5949
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5996
+#: ../dgit:6059
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6027
+#: ../dgit:6091
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6032
+#: ../dgit:6096
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:6043
+#: ../dgit:6131
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6134
+#: ../dgit:6245
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"
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6148
+#: ../dgit:6259
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6185
+#: ../dgit:6293
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6306
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6324
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6340
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6354
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6378
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6188
+#: ../dgit:6388
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6194
+#: ../dgit:6397
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6198
+#: ../dgit:6401
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6205
+#: ../dgit:6408
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6412
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6208
+#: ../dgit:6415
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6211
+#: ../dgit:6418
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6214
+#: ../dgit:6421
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6218
+#: ../dgit:6425
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6227
+#: ../dgit:6436
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6265
+#: ../dgit:6475
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
"\n"
msgstr ""
-#: ../dgit:6277
+#: ../dgit:6487
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6306
+#: ../dgit:6516
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:6318
+#: ../dgit:6528
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6321
+#: ../dgit:6531
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6324
+#: ../dgit:6534
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:6342
+#: ../dgit:6547
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6564
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6356
+#: ../dgit:6578
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6369
+#: ../dgit:6597
#, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "-p specified package %s, but changelog says %s"
msgstr ""
-#: ../dgit:6408
+#: ../dgit:6607
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6616
+#, perl-format
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6620
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6655
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6410
+#: ../dgit:6657
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6436
+#: ../dgit:6683
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6689
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6445
+#: ../dgit:6692
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6488
+#: ../dgit:6735
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6526
+#: ../dgit:6773
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6533
+#: ../dgit:6780
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6540
+#: ../dgit:6787
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6544
+#: ../dgit:6791
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6549
+#: ../dgit:6796
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6552
+#: ../dgit:6799
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6565
+#: ../dgit:6812
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6583
+#: ../dgit:6830
msgid "build successful\n"
msgstr ""
-#: ../dgit:6590
+#: ../dgit:6837
#, 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:6700
+#: ../dgit:6947
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6735
+#: ../dgit:6984
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6755
+#: ../dgit:7004
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6768
+#: ../dgit:7017
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6772
+#: ../dgit:7021
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6779
+#: ../dgit:7028
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6785
+#: ../dgit:7034
msgid "source changes file"
msgstr ""
-#: ../dgit:6787
+#: ../dgit:7036
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7056 ../dgit:7058
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6822
+#: ../dgit:7071
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:6834
+#: ../dgit:7083
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6838
+#: ../dgit:7087
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:6868
+#: ../dgit:7117
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6890
+#: ../dgit:7138
msgid "source tree"
msgstr ""
-#: ../dgit:6892
+#: ../dgit:7140
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6905
+#: ../dgit:7153
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6909
+#: ../dgit:7157
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6913
+#: ../dgit:7161
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6930
+#: ../dgit:7178
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6935
+#: ../dgit:7183
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6937
+#: ../dgit:7185
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7196
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6951
+#: ../dgit:7199
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6962
+#: ../dgit:7210
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6973
+#: ../dgit:7221
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6982
+#: ../dgit:7230
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6989
+#: ../dgit:7237
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6991
+#: ../dgit:7239
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6996
+#: ../dgit:7244
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7001
+#: ../dgit:7249
#, perl-format
msgid ""
"Branch %s already exists\n"
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7021
+#: ../dgit:7269
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7023
+#: ../dgit:7271
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7031
+#: ../dgit:7279
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:7050
+#: ../dgit:7298
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:7054
+#: ../dgit:7302
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:7055
+#: ../dgit:7303
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:7066
+#: ../dgit:7314
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:7068
+#: ../dgit:7316
msgid "Import, merging."
msgstr ""
-#: ../dgit:7082
+#: ../dgit:7330
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7091
+#: ../dgit:7339
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7098
+#: ../dgit:7346
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7104
+#: ../dgit:7352
#, perl-format
msgid "exec curl: %s\n"
msgstr ""
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr ""
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7131
+#: ../dgit:7379
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7368
+#: ../dgit:7620
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7423
+#: ../dgit:7675
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7438
+#: ../dgit:7690
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7442
+#: ../dgit:7694
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7448
+#: ../dgit:7700
#, perl-format
msgid ""
"On entry to dgit, %s\n"
"Giving up.\n"
msgstr ""
-#: ../dgit:7465
+#: ../dgit:7717
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7478
+#: ../dgit:7730
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7498
+#: ../dgit:7750
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7508
+#: ../dgit:7761
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7545
+#: ../dgit:7789
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7546
+#: ../dgit:7790
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7565
+#: ../dgit:7809
#, perl-format
msgid "unknown operation %s"
msgstr ""
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr ""
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr ""
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr ""
-#: ../git-debrebase:401
+#: ../git-debrebase:364
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:404
+#: ../git-debrebase:367
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:417
+#: ../git-debrebase:380
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
-#: ../git-debrebase:423
+#: ../git-debrebase:386
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr ""
-#: ../git-debrebase:427
+#: ../git-debrebase:390
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
-#: ../git-debrebase:459
+#: ../git-debrebase:422
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
msgstr ""
-#: ../git-debrebase:466
+#: ../git-debrebase:429
#, perl-format
msgid ""
"%s\n"
"Is this meant to be a gdr branch? %s\n"
msgstr ""
-#: ../git-debrebase:471
+#: ../git-debrebase:434
#, perl-format
msgid ""
"%s\n"
"Consider git-debrebase scrap, to throw away your recent work.\n"
msgstr ""
-#: ../git-debrebase:477
+#: ../git-debrebase:440
#, perl-format
msgid ""
"%s\n"
"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
msgstr ""
-#: ../git-debrebase:488
+#: ../git-debrebase:451
#, perl-format
msgid ""
"%s\n"
"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
msgstr ""
-#: ../git-debrebase:935
+#: ../git-debrebase:898
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr ""
-#: ../git-debrebase:937
+#: ../git-debrebase:900
msgid "has other than two parents"
msgstr ""
-#: ../git-debrebase:938
+#: ../git-debrebase:901
msgid "contains debian/patches"
msgstr ""
-#: ../git-debrebase:964
+#: ../git-debrebase:927
msgid "is an origin commit"
msgstr ""
-#: ../git-debrebase:966
+#: ../git-debrebase:929
msgid "upstream files differ from left parent"
msgstr ""
-#: ../git-debrebase:968
+#: ../git-debrebase:931
msgid "debian/ differs from right parent"
msgstr ""
-#: ../git-debrebase:979
+#: ../git-debrebase:942
msgid "edits debian/patches"
msgstr ""
-#: ../git-debrebase:991
+#: ../git-debrebase:954
msgid "parent's debian is not a directory"
msgstr ""
-#: ../git-debrebase:998
+#: ../git-debrebase:961
msgid "no changes"
msgstr ""
-#: ../git-debrebase:1004
+#: ../git-debrebase:967
msgid "origin commit"
msgstr ""
-#: ../git-debrebase:1055
+#: ../git-debrebase:1018
#, perl-format
msgid "unknown kind of merge from %s"
msgstr ""
-#: ../git-debrebase:1058
+#: ../git-debrebase:1021
msgid "octopus merge"
msgstr ""
-#: ../git-debrebase:1062
+#: ../git-debrebase:1025
msgid "general two-parent merge"
msgstr ""
-#: ../git-debrebase:1079
+#: ../git-debrebase:1042
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr ""
-#: ../git-debrebase:1119
+#: ../git-debrebase:1082
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr ""
-#: ../git-debrebase:1147
+#: ../git-debrebase:1110
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr ""
-#: ../git-debrebase:1148
+#: ../git-debrebase:1111
#, perl-format
msgid " (eg %s)"
msgstr ""
-#: ../git-debrebase:1154
+#: ../git-debrebase:1117
msgid "found mixed upstream/packaging commit"
msgstr ""
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131
+#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150
#, perl-format
msgid " (%s)"
msgstr ""
-#: ../git-debrebase:1162
+#: ../git-debrebase:1125
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr ""
-#: ../git-debrebase:1167
+#: ../git-debrebase:1130
msgid "found dgit dsc import"
msgstr ""
-#: ../git-debrebase:1172
+#: ../git-debrebase:1135
msgid "found bare dgit dsc import with no prior history"
msgstr ""
-#: ../git-debrebase:1178
+#: ../git-debrebase:1141
msgid "found vanilla merge"
msgstr ""
-#: ../git-debrebase:1185
+#: ../git-debrebase:1148
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr ""
-#: ../git-debrebase:1253
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1254
+#: ../git-debrebase:1217
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1375
+#: ../git-debrebase:1338
msgid "bare dgit dsc import"
msgstr ""
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1678 ../git-debrebase:1681
#, perl-format
msgid "mismatch %s ?"
msgstr ""
-#: ../git-debrebase:1721
+#: ../git-debrebase:1684
#, perl-format
msgid "mismatch %s != %s ?"
msgstr ""
-#: ../git-debrebase:1731
+#: ../git-debrebase:1694
#, perl-format
msgid "internal error %#x %s %s"
msgstr ""
-#: ../git-debrebase:1759
+#: ../git-debrebase:1722
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr ""
-#: ../git-debrebase:1773
+#: ../git-debrebase:1736
msgid "you are in the middle of a git-rebase already"
msgstr ""
-#: ../git-debrebase:1799
+#: ../git-debrebase:1762
msgid "launder for rebase"
msgstr ""
-#: ../git-debrebase:1804
+#: ../git-debrebase:1767
msgid "analyse does not support any options"
msgstr ""
-#: ../git-debrebase:1806
+#: ../git-debrebase:1769
msgid "too many arguments to analyse"
msgstr ""
-#: ../git-debrebase:1841
+#: ../git-debrebase:1802
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1804
msgid "HEAD symref is not to refs/heads/"
msgstr ""
-#: ../git-debrebase:1864
+#: ../git-debrebase:1827
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr ""
-#: ../git-debrebase:1868
+#: ../git-debrebase:1831
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr ""
-#: ../git-debrebase:1872
+#: ../git-debrebase:1835
#, perl-format
msgid "you have diverged from %s"
msgstr ""
-#: ../git-debrebase:1894
+#: ../git-debrebase:1857
msgid "remote dgit branch"
msgstr ""
-#: ../git-debrebase:1897
+#: ../git-debrebase:1860
msgid "remote dgit branch for sid"
msgstr ""
-#: ../git-debrebase:1925
+#: ../git-debrebase:1888
msgid "Recorded previous head for preservation"
msgstr ""
-#: ../git-debrebase:1933
+#: ../git-debrebase:1896
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1944
+#: ../git-debrebase:1907
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1964
+#: ../git-debrebase:1927
msgid "fast forward"
msgstr ""
-#: ../git-debrebase:1974
+#: ../git-debrebase:1937
msgid "Declare fast forward / record previous work"
msgstr ""
-#: ../git-debrebase:1986
+#: ../git-debrebase:1949
msgid "No ffq-prev to stitch."
msgstr ""
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1966
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr ""
-#: ../git-debrebase:2041
+#: ../git-debrebase:1971
#, perl-format
msgid "bad version number `%s'"
msgstr ""
-#: ../git-debrebase:2059
+#: ../git-debrebase:1989
#, perl-format
msgid "upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2060
+#: ../git-debrebase:1990
msgid "upstream (main piece"
msgstr ""
-#: ../git-debrebase:2080
+#: ../git-debrebase:2010
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr ""
-#: ../git-debrebase:2098
+#: ../git-debrebase:2028
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr ""
-#: ../git-debrebase:2114
+#: ../git-debrebase:2044
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"but has %d parents (one per piece plus maybe a previous combine)"
msgstr ""
-#: ../git-debrebase:2123
+#: ../git-debrebase:2053
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
-#: ../git-debrebase:2136
+#: ../git-debrebase:2066
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"commit"
msgstr ""
-#: ../git-debrebase:2147
+#: ../git-debrebase:2077
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2150
+#: ../git-debrebase:2080
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2153
+#: ../git-debrebase:2083
#, perl-format
msgid "not fast forward: %s %s"
msgstr ""
-#: ../git-debrebase:2264
+#: ../git-debrebase:2194
msgid "Previous head already recorded\n"
msgstr ""
-#: ../git-debrebase:2268
+#: ../git-debrebase:2198
#, perl-format
msgid "Could not preserve: %s"
msgstr ""
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215
+#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338
+#: ../git-debrebase:2402
msgid "no arguments allowed"
msgstr ""
-#: ../git-debrebase:2307
+#: ../git-debrebase:2237
msgid "branch contains furniture (not laundered)"
msgstr ""
-#: ../git-debrebase:2308
+#: ../git-debrebase:2238
msgid "branch is unlaundered"
msgstr ""
-#: ../git-debrebase:2309
+#: ../git-debrebase:2239
msgid "branch needs laundering"
msgstr ""
-#: ../git-debrebase:2310
+#: ../git-debrebase:2240
msgid "branch not in git-debrebase form"
msgstr ""
-#: ../git-debrebase:2320
+#: ../git-debrebase:2250
msgid "current branch contents, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2322
+#: ../git-debrebase:2252
msgid " branch is laundered\n"
msgstr ""
-#: ../git-debrebase:2338
+#: ../git-debrebase:2268
#, perl-format
msgid " %s is not well-defined\n"
msgstr ""
-#: ../git-debrebase:2344
+#: ../git-debrebase:2274
msgid "key git-debrebase commits:\n"
msgstr ""
-#: ../git-debrebase:2345
+#: ../git-debrebase:2275
msgid "anchor"
msgstr ""
-#: ../git-debrebase:2346
+#: ../git-debrebase:2276
msgid "breakwater"
msgstr ""
-#: ../git-debrebase:2351
+#: ../git-debrebase:2281
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2358
+#: ../git-debrebase:2288
msgid " unstitched; previous tip was:\n"
msgstr ""
-#: ../git-debrebase:2361
+#: ../git-debrebase:2291
msgid " stitched? (no record of git-debrebase work)\n"
msgstr ""
-#: ../git-debrebase:2363
+#: ../git-debrebase:2293
msgid " stitched\n"
msgstr ""
-#: ../git-debrebase:2365
+#: ../git-debrebase:2295
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr ""
-#: ../git-debrebase:2368
+#: ../git-debrebase:2298
msgid "you are currently rebasing\n"
msgstr ""
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2315 ../git-debrebase:2328
msgid "launder for git-debrebase quick"
msgstr ""
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2322 ../git-debrebase:2352
msgid "No ongoing git-debrebase session."
msgstr ""
-#: ../git-debrebase:2461
+#: ../git-debrebase:2391
msgid "Commit patch queue (exported by git-debrebase)"
msgstr ""
-#: ../git-debrebase:2478
+#: ../git-debrebase:2408
msgid "No (more) patches to export."
msgstr ""
-#: ../git-debrebase:2485
+#: ../git-debrebase:2415
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"laundering first."
msgstr ""
-#: ../git-debrebase:2505
+#: ../git-debrebase:2435
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr ""
-#: ../git-debrebase:2510
+#: ../git-debrebase:2440
#, perl-format
msgid "patch %s repeated in %s !"
msgstr ""
-#: ../git-debrebase:2517
+#: ../git-debrebase:2447
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr ""
-#: ../git-debrebase:2525
+#: ../git-debrebase:2455
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2530
+#: ../git-debrebase:2460
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2546
+#: ../git-debrebase:2476
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2551
+#: ../git-debrebase:2481
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2567
+#: ../git-debrebase:2497
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2575
+#: ../git-debrebase:2505
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2582
+#: ../git-debrebase:2512
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"files - are you sure this is a gbp (patches-unapplied) branch?"
msgstr ""
-#: ../git-debrebase:2584
+#: ../git-debrebase:2514
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2591
+#: ../git-debrebase:2521
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2609
+#: ../git-debrebase:2539
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2615
+#: ../git-debrebase:2545
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2618
+#: ../git-debrebase:2548
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2621
+#: ../git-debrebase:2551
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2623
+#: ../git-debrebase:2553
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2625
+#: ../git-debrebase:2555
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2632
+#: ../git-debrebase:2562
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2678
+#: ../git-debrebase:2608
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2707
+#: ../git-debrebase:2637
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2728
+#: ../git-debrebase:2658
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2736
+#: ../git-debrebase:2666
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2750
+#: ../git-debrebase:2680
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2754
+#: ../git-debrebase:2684
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2766
+#: ../git-debrebase:2696
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2773
+#: ../git-debrebase:2703
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2779
+#: ../git-debrebase:2709
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2788
+#: ../git-debrebase:2718
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2794
+#: ../git-debrebase:2724
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2825
+#: ../git-debrebase:2755
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2834
+#: ../git-debrebase:2764
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2871
+#: ../git-debrebase:2801
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2880
+#: ../git-debrebase:2810
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2894
+#: ../git-debrebase:2824
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"upstream commmit explicitly or provide suitable origs.\n"
msgstr ""
-#: ../git-debrebase:2900
+#: ../git-debrebase:2830
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2907
+#: ../git-debrebase:2837
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2911
+#: ../git-debrebase:2841
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3013
+#: ../git-debrebase:2943
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3023
+#: ../git-debrebase:2953
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3053
+#: ../git-debrebase:2983
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:293
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:319
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:338
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:340
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:347
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:353
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:359
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:361
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:363
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:454
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:464
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:483
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:489
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:510
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:513
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:621
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:622
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:644
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:650
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:764
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:765
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:781
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:790
#, 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:729
+#: ../Debian/Dgit.pm:804
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:825
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:911
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:932
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1000
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1023
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1031
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1040
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
msgstr ""
"Project-Id-Version: dgit_8.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
+"POT-Creation-Date: 2019-07-21 00:36+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"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../dgit:242
+#: ../dgit:264
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr "%s: ongeldige configuratie: %s\n"
-#: ../dgit:249
+#: ../dgit:271
msgid "warning: overriding problem due to --force:\n"
msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n"
-#: ../dgit:257
+#: ../dgit:279
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
"waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
-#: ../dgit:262
+#: ../dgit:284
#, 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:487
+#: ../dgit:516
#, perl-format
msgid "build host child %s"
msgstr "bouwcomputer-dochter %s"
-#: ../dgit:492 ../dgit:498
+#: ../dgit:521 ../dgit:527
#, perl-format
msgid "connection lost: %s"
msgstr "verbinding verbroken: %s"
-#: ../dgit:493
+#: ../dgit:522
#, perl-format
msgid "protocol violation; %s not expected"
msgstr "protocolschending; %s werd niet verwacht"
-#: ../dgit:501
+#: ../dgit:530
#, perl-format
msgid "eof (reading %s)"
msgstr "eof (bij het lezen van %s)"
-#: ../dgit:508
+#: ../dgit:537
msgid "protocol message"
msgstr "protocolbericht"
-#: ../dgit:516
+#: ../dgit:545
#, perl-format
msgid "`%s'"
msgstr "`%s'"
-#: ../dgit:537
+#: ../dgit:566
msgid "bad byte count"
msgstr "aantal slechte bytes"
-#: ../dgit:540
+#: ../dgit:569
msgid "data block"
msgstr "gegevensblok"
-#: ../dgit:621
+#: ../dgit:650
#, perl-format
msgid "failed to fetch %s: %s"
msgstr "ophalen (fetch) van %s mislukt: %s"
-#: ../dgit:633
+#: ../dgit:662
#, perl-format
msgid "%s ok: %s"
msgstr "%s oké: %s"
-#: ../dgit:635
+#: ../dgit:664
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr "zou oké zijn: %s (maar slechts een testuitvoering)"
-#: ../dgit:660
+#: ../dgit:689
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
" -c<naam>=<waarde> configuratieoptie instellen voor git\n"
" (ook rechtstreeks gebruikt door dgit)\n"
-#: ../dgit:679
+#: ../dgit:708
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:683
+#: ../dgit:712
#, perl-format
msgid ""
"%s: %s\n"
"%s: %s\n"
"%s"
-#: ../dgit:688
+#: ../dgit:717
msgid "too few arguments"
msgstr "te weinig argumenten"
-#: ../dgit:799
+#: ../dgit:833
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr "verschillende waarden voor %s (in %s git config)"
-#: ../dgit:802
+#: ../dgit:836
#, 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:822
+#: ../dgit:856
#, perl-format
msgid ""
"need value for one of: %s\n"
"heb waarde nodig voor één van: %s\n"
"%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden"
-#: ../dgit:863
+#: ../dgit:897
#, 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:878
+#: ../dgit:912
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr "backports-spitsvondigheid vereist % of ( )"
-#: ../dgit:894
+#: ../dgit:928
#, 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:914
+#: ../dgit:948
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:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:966
+#, fuzzy, perl-format
+#| msgid "unknown %s setting `%s'"
+msgid "unknown %s `%s'"
+msgstr "onbekende %s dat `%s' instelt"
+
+#: ../dgit:971 ../git-debrebase:1549 ../Debian/Dgit.pm:206
msgid "internal error"
msgstr "interne fout"
-#: ../dgit:925
+#: ../dgit:973
msgid "pushing but distro is configured readonly"
msgstr ""
"bezig een push uit te voeren, maar de distributie is voor alleen-lezen "
"geconfigureerd"
-#: ../dgit:929
+#: ../dgit:977
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost "
"werd.\n"
-#: ../dgit:1094
+#: ../dgit:1000
+#, perl-format
+msgid ""
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
+msgstr ""
+
+#: ../dgit:1163
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:1140
+#: ../dgit:1209
#, perl-format
msgid ""
"config requested specific TLS key but do not know how to get curl to use "
"de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl "
"ertoe te brengen exact die EE-sleutel (%s) te gebruiken"
-#: ../dgit:1161
+#: ../dgit:1230
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
"de methode ftpmasterapi voor een verzoek aan het archief kent geen data-"
"onderdeel"
-#: ../dgit:1169
+#: ../dgit:1238
msgid "curl failed to print 3-digit HTTP code"
msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code"
-#: ../dgit:1173
+#: ../dgit:1242
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr "een fetch van %s gaf HTTP-code %s"
-#: ../dgit:1189
+#: ../dgit:1258
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr "onbekende suite %s, misschien is -d nuttig"
-#: ../dgit:1193
+#: ../dgit:1262
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr "meerdere overeenkomsten met suite %s\n"
-#: ../dgit:1195
+#: ../dgit:1264
#, perl-format
msgid "suite %s info has no codename\n"
msgstr "info over suite %s bevat geen codenaam\n"
-#: ../dgit:1197
+#: ../dgit:1266
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n"
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1268 ../dgit:1293
msgid "bad ftpmaster api response: "
msgstr "verkeerd antwoord van de ftpmaster api:"
-#: ../dgit:1213
+#: ../dgit:1282
#, perl-format
msgid "bad version: %s\n"
msgstr "verkeerde versie: %s\n"
-#: ../dgit:1215
+#: ../dgit:1284
msgid "bad component"
msgstr "verkeerde component"
-#: ../dgit:1218
+#: ../dgit:1287
msgid "bad filename"
msgstr "verkeerde bestandsnaam"
-#: ../dgit:1220
+#: ../dgit:1289
msgid "bad sha256sum"
msgstr "verkeerde sha256sum"
-#: ../dgit:1271
+#: ../dgit:1340
msgid "aptget archive query method takes no data part"
msgstr ""
"de methode aptget voor een verzoek aan het archief kent geen data-onderdeel"
-#: ../dgit:1355
+#: ../dgit:1424
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
" zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit "
"het geval zijn, gebruik dan `relatime'.)\n"
-#: ../dgit:1377
+#: ../dgit:1448
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s"
-#: ../dgit:1405
+#: ../dgit:1474
msgid "apt-get source did not produce a .dsc"
msgstr "apt-get source produceerde geen .dsc-bestand"
-#: ../dgit:1406
+#: ../dgit:1475
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)"
-#: ../dgit:1511
+#: ../dgit:1580
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar "
"niet bestaat in suite %s; --existing-package kan behulpzaam zijn"
-#: ../dgit:1702
+#: ../dgit:1719
#, perl-format
msgid "cannot operate on %s suite"
msgstr "kan geen acties uitvoeren op suite %s"
-#: ../dgit:1705
+#: ../dgit:1722
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr "de gebruikelijke suitenaam voor %s is %s"
-#: ../dgit:1707
+#: ../dgit:1724
#, perl-format
msgid "canonical suite name is %s"
msgstr "de gebruikelijke suitenaam is %s"
-#: ../dgit:1727
+#: ../dgit:1744
#, 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:1733
+#: ../dgit:1750
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr "niet-ondersteunde broncode-indeling %s, sorry"
-#: ../dgit:1760
+#: ../dgit:1777
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)"
-#: ../dgit:1777
+#: ../dgit:1794
msgid "unexpected results from git check query - "
msgstr "het verzoek git check leverde onverwachte resultaten op - "
-#: ../dgit:1792
+#: ../dgit:1809
#, perl-format
msgid "unknown git-check `%s'"
msgstr "onbekende git-check `%s'"
-#: ../dgit:1807
+#: ../dgit:1824
#, perl-format
msgid "unknown git-create `%s'"
msgstr "onbekende git-create `%s'"
-#: ../dgit:1844
+#: ../dgit:1861
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
-#: ../dgit:1890
+#: ../dgit:1907
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr "kon .dsc %s regel `%s' niet ontleden"
-#: ../dgit:1901
+#: ../dgit:1918
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s"
-#: ../dgit:1947
+#: ../dgit:1964
#, 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:1956
+#: ../dgit:1973
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr "bestandenlijst in %s varieert tussen hash-velden!"
-#: ../dgit:1960
+#: ../dgit:1977
#, perl-format
msgid "%s has no files list field(s)"
msgstr "%s bevat geen veld(en) met een bestandenlijst"
-#: ../dgit:1966
+#: ../dgit:1983
#, 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:2006
+#: ../dgit:2023
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n"
-#: ../dgit:2019
+#: ../dgit:2036
msgid "cannot find section/priority from .changes Files field"
msgstr ""
"kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand"
-#: ../dgit:2032
+#: ../dgit:2049
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:2048
+#: ../dgit:2065
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ".dsc %s mist een item voor %s"
-#: ../dgit:2053
+#: ../dgit:2070
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr "%s: %s (archief) != %s (lokale .dsc)"
-#: ../dgit:2061
+#: ../dgit:2078
#, perl-format
msgid "archive %s: %s"
msgstr "archief %s: %s"
-#: ../dgit:2068
+#: ../dgit:2085
#, perl-format
msgid "archive contains %s with different checksum"
msgstr "archief bevat %s met een andere checksum"
-#: ../dgit:2096
+#: ../dgit:2113
#, 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:2104
+#: ../dgit:2121
#, perl-format
msgid "[new .changes left in %s]"
msgstr "[nieuwe .changes achtergelaten in %s]"
-#: ../dgit:2107
+#: ../dgit:2124
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)"
-#: ../dgit:2131
+#: ../dgit:2143
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"onverwachte indeling `%s' van de auteursregel van de commit (werd "
"gegenereerd uit het Maintainer-veld in changelog)"
-#: ../dgit:2154
+#: ../dgit:2166
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
"dat verschillende distributies andere broncode hebben).\n"
"\n"
-#: ../dgit:2166
+#: ../dgit:2178
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
"Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan "
"niet voortgaan"
-#: ../dgit:2197
+#: ../dgit:2209
msgid "Dpkg::Vendor `current vendor'"
msgstr "Dpkg::Vendor `current vendor'"
-#: ../dgit:2199
+#: ../dgit:2211
msgid "(base) distro being accessed"
msgstr "(basis)-distributie wordt benaderd"
-#: ../dgit:2201
+#: ../dgit:2213
msgid "(nominal) distro being accessed"
msgstr "(nominale) distributie wordt benaderd"
-#: ../dgit:2206
+#: ../dgit:2218
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr "build-products-dir %s is niet toegankelijk: %s\n"
-#: ../dgit:2231
+#: ../dgit:2243
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met "
"overbrengen:\n"
-#: ../dgit:2235
+#: ../dgit:2247
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr "controleer orig-bestand %s in bpd %s: %s"
-#: ../dgit:2237
+#: ../dgit:2249
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr "controleer orig-bestand %s in ..: %s"
-#: ../dgit:2240
+#: ../dgit:2252
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s"
-#: ../dgit:2249
+#: ../dgit:2261
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n"
-#: ../dgit:2253
+#: ../dgit:2265
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr "%s: vast gekoppelde orig van ..: %s\n"
-#: ../dgit:2256
+#: ../dgit:2268
#, 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:2262
+#: ../dgit:2274
#, 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:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr "bezig met benaderen van %s: %s"
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr "bezig met opslaan van %s: %s"
-
-#: ../dgit:2386
+#: ../dgit:2345
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr "dgit (dochter): exec %s: %s"
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr "broncodepakket"
-
-#: ../dgit:2468
+#: ../dgit:2407
msgid "package changelog"
msgstr "changelog van het pakket"
-#: ../dgit:2508
+#: ../dgit:2447
msgid "package changelog has no entries!"
msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!"
-#: ../dgit:2527
+#: ../dgit:2516 ../dgit:2521
#, perl-format
-msgid "Import %s"
-msgstr "Importeren van %s"
+msgid "accessing %s: %s"
+msgstr "bezig met benaderen van %s: %s"
-#: ../dgit:2608
+#: ../dgit:2536 ../dgit:2543
+#, perl-format
+msgid "saving %s: %s"
+msgstr "bezig met opslaan van %s: %s"
+
+#: ../dgit:2569 ../dgit:6035
+msgid "source package"
+msgstr "broncodepakket"
+
+#: ../dgit:2647
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr "%s: langzame absurd-git-apply wordt gebruikt..."
-#: ../dgit:2627
+#: ../dgit:2666
#, perl-format
msgid "%s failed: %s\n"
msgstr "%s mislukte: %s\n"
-#: ../dgit:2636
+#: ../dgit:2675
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
" gbp-pq import gaf boom %s\n"
" dpkg-source --before-build gaf boom %s\n"
-#: ../dgit:2651
+#: ../dgit:2690
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr "git commit samengesteld vanuit .dsc %s"
-#: ../dgit:2655
+#: ../dgit:2694
msgid "Import of source package"
msgstr "Importeren van broncodepakket"
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr "Gegeven %s (%s) uit archiefsuite %s\n"
-
-#: ../dgit:2672
+#: ../dgit:2714
#, perl-format
msgid ""
"\n"
"Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n"
"%s\n"
-#: ../dgit:2714
+#: ../dgit:2756
#, perl-format
msgid "using existing %s"
msgstr "bestaande %s wordt gebruikt"
-#: ../dgit:2718
+#: ../dgit:2760
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit "
"bestand verwijderen?)"
-#: ../dgit:2722
+#: ../dgit:2764
#, perl-format
msgid "need to fetch correct version of %s"
msgstr "moet de juiste versie van %s ophalen met fetch"
-#: ../dgit:2738
+#: ../dgit:2780
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
"bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd "
"bestand van het archief!)"
-#: ../dgit:2833
+#: ../dgit:2875
msgid "too many iterations trying to get sane fetch!"
msgstr "te veel pogingen om een foutloze fetch te bekomen!"
-#: ../dgit:2848
+#: ../dgit:2890
#, 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:2892
+#: ../dgit:2934
#, 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:2907
+#: ../dgit:2949
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"
"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:2912
+#: ../dgit:2954
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
"waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n"
"waarschuwing: bijwerkt. Zal later opnieuw proberen...\n"
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n"
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr "%s: GEEN hash van git"
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr "%s: git info werd opgegeven (%s)"
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr "%s: git hash werd opgegeven"
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr "%s: ongeldige Dgit info"
-
-#: ../dgit:3063
+#: ../dgit:3101
#, 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:3068
+#: ../dgit:3106
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald"
-#: ../dgit:3073
+#: ../dgit:3111
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\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:3083
+#: ../dgit:3121
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\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:3103
+#: ../dgit:3141
msgid "rewrite map"
msgstr "modificatieplan (rewrite map)"
-#: ../dgit:3110
+#: ../dgit:3148
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:3114
+#: ../dgit:3152
msgid "using rewritten git hash in place of .dsc value"
msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde"
-#: ../dgit:3116
+#: ../dgit:3154
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:3123
+#: ../dgit:3161
msgid "additional commits"
msgstr "extra vastleggingen (commits)"
-#: ../dgit:3126
+#: ../dgit:3164
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"De Dgit-metadata uit .dsc vereist commit %s\n"
"maar we konden dat object nergens bekomen.\n"
-#: ../dgit:3151
+#: ../dgit:3189
msgid "last upload to archive"
msgstr "laatste upload naar het archief"
-#: ../dgit:3155
+#: ../dgit:3193
msgid "no version available from the archive"
msgstr "geen versie beschikbaar uit het archief"
-#: ../dgit:3238
+#: ../dgit:3276
msgid "dgit suite branch on dgit git server"
msgstr "dgit suite-tak op dgit git-server"
-#: ../dgit:3245
+#: ../dgit:3283
msgid "dgit client's archive history view"
msgstr "dgit - weergave geschiedenis van cliëntarchief"
-#: ../dgit:3250
+#: ../dgit:3288
msgid "Dgit field in .dsc from archive"
msgstr "Dgit-veld in het .dsc uit het archief"
-#: ../dgit:3278
+#: ../dgit:3316
#, perl-format
msgid ""
"\n"
"Laatste versie die met dgit gepusht werd: %s\n"
"%s\n"
-#: ../dgit:3291
+#: ../dgit:3329
msgid "archive .dsc names newer git commit"
msgstr ".dsc van het archief vermeldt een recentere git commit"
-#: ../dgit:3294
+#: ../dgit:3332
msgid "archive .dsc names other git commit, fixing up"
msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd"
-#: ../dgit:3315
+#: ../dgit:3353
#, perl-format
msgid ""
"\n"
"dgit.\n"
"%s\n"
-#: ../dgit:3324
+#: ../dgit:3362
#, perl-format
msgid ""
"\n"
"Maar we konden geen enkele versie bekomen uit het archief of uit git.\n"
"\n"
-#: ../dgit:3409
+#: ../dgit:3447
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
"\n"
"Gegeven dat\n"
-#: ../dgit:3422
+#: ../dgit:3460
msgid "should be treated as descended from\n"
msgstr "behandeld zou moeten worden als afstammend van\n"
-#: ../dgit:3440
+#: ../dgit:3478
msgid "dgit repo server tip (last push)"
msgstr "tip van de dgit-opslagplaats op de server (laatste push)"
-#: ../dgit:3442
+#: ../dgit:3480
msgid "local tracking tip (last fetch)"
msgstr "tip van de lokale kopie (laatste fetch)"
-#: ../dgit:3453
+#: ../dgit:3491
#, perl-format
msgid ""
"\n"
"We waren slechts in staat om %s te bekomen\n"
"\n"
-#: ../dgit:3468
+#: ../dgit:3506
msgid "fetched source tree"
msgstr "broncodeboom opgehaald"
-#: ../dgit:3504
+#: ../dgit:3542
msgid "debian/changelog merge driver"
msgstr "stuurprogramma voor samenvoeging van debian/changelog"
-#: ../dgit:3569
+#: ../dgit:3607
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
"[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n"
" gitattributes wordt niet verder ingesteld\n"
-#: ../dgit:3583
+#: ../dgit:3621
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:3598
+#: ../dgit:3636
#, perl-format
msgid "install %s: %s"
msgstr "installeren van %s: %s"
-#: ../dgit:3625
+#: ../dgit:3663
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
"dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit "
"setup-new-tree.\n"
-#: ../dgit:3647
+#: ../dgit:3685
#, perl-format
msgid "fetching %s..."
msgstr "ophalen van %s..."
-#: ../dgit:3655
+#: ../dgit:3693
#, perl-format
msgid "failed to obtain %s: %s"
msgstr "verkrijgen van %s mislukte: %s"
-#: ../dgit:3694
+#: ../dgit:3732
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr "pakket %s ontbreekt in (basissuite) %s"
-#: ../dgit:3726
+#: ../dgit:3764
msgid "local combined tracking branch"
msgstr "lokale gecombineerde navolgende tak (tracking branch)"
-#: ../dgit:3728
+#: ../dgit:3766
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:3767
+#: ../dgit:3805
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
"\n"
"Invoertakken:\n"
-#: ../dgit:3781
+#: ../dgit:3819
msgid ""
"\n"
"Key\n"
" + markeert elke tak die niet reeds een voorouder was\n"
"\n"
-#: ../dgit:3796
+#: ../dgit:3834
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr "berekende gecombineerde navolgende suite %s"
-#: ../dgit:3814
+#: ../dgit:3852
#, perl-format
msgid "ready for work in %s"
msgstr "klaar om te werken in %s"
-#: ../dgit:3822
+#: ../dgit:3860
msgid "dry run makes no sense with clone"
msgstr "dry run is zinloos met clone"
-#: ../dgit:3837
+#: ../dgit:3875
#, perl-format
msgid "create `%s': %s"
msgstr "creëren van `%s': %s"
-#: ../dgit:3853
+#: ../dgit:3891
msgid "fetching existing git history"
msgstr "ophalen van bestaande git-geschiedenis"
-#: ../dgit:3857
+#: ../dgit:3895
msgid "starting new git history"
msgstr "starten van een nieuwe git-geschiedenis"
-#: ../dgit:3883
+#: ../dgit:3921
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
" De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit "
"update-vcs-git gebruiken?\n"
-#: ../dgit:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr "opgehaald naar %s"
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr "Samenvoegen vanuit %s [dgit]"
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr "opgehaald naar %s samengevoegd naar HEAD"
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr "git-boom bevat %s"
-#: ../dgit:3921
+#: ../dgit:3959
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:3940
+#: ../dgit:3978
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
"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:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr "niets quilt-achtig vast te leggen, oké."
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr " (wilde een patch-update vastleggen)"
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
"Vastleggen van (commit) Debian 3.0 (quilt) metadata\n"
"\n"
-#: ../dgit:4007
+#: ../dgit:4045
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
"Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --"
"quilt=nocheck"
-#: ../dgit:4012
+#: ../dgit:4050
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken"
-#: ../dgit:4022
+#: ../dgit:4060
#, perl-format
msgid "commit id %s"
msgstr "vastleggings-id (commit id) %s"
-#: ../dgit:4028
+#: ../dgit:4066
#, perl-format
msgid "and left in %s"
msgstr "en achtergelaten in %s"
-#: ../dgit:4054
+#: ../dgit:4092
#, 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:4057
+#: ../dgit:4095
#, 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:4065
+#: ../dgit:4103
#, 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:4074
+#: ../dgit:4112
msgid "version currently in archive"
msgstr "momenteel in het archief aanwezige versie"
-#: ../dgit:4083
+#: ../dgit:4121
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
"Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie "
"%s ..."
-#: ../dgit:4091
+#: ../dgit:4129
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr "veld %s van dpkg-parsechangelog %s"
-#: ../dgit:4101
+#: ../dgit:4140
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr "Vermeldt debian/changelog misschien %s niet?"
-#: ../dgit:4104
+#: ../dgit:4143
#, perl-format
msgid ""
"%s is %s\n"
"%s is %s\n"
"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n"
-#: ../dgit:4118
+#: ../dgit:4157
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..."
-#: ../dgit:4174
+#: ../dgit:4213
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..."
-#: ../dgit:4183
+#: ../dgit:4222
msgid "maintainer view tag"
msgstr "tag weergave pakketonderhouder"
-#: ../dgit:4185
+#: ../dgit:4224
msgid "dgit view tag"
msgstr "tag weergave dgit"
-#: ../dgit:4186
+#: ../dgit:4225
msgid "current archive contents"
msgstr "huidige inhoud van het archief"
-#: ../dgit:4199
+#: ../dgit:4238
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:4209
+#: ../dgit:4248
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr "Lineair (fast forward) declareren vanuit %s\n"
-#: ../dgit:4210
+#: ../dgit:4249
#, perl-format
msgid "Make fast forward from %s\n"
msgstr "Lineair (fast forward) maken vanuit %s\n"
-#: ../dgit:4214
+#: ../dgit:4253
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave."
-#: ../dgit:4227
+#: ../dgit:4266
#, perl-format
msgid "Declare fast forward from %s"
msgstr "Lineair (fast forward) declareren vanuit %s"
-#: ../dgit:4235
+#: ../dgit:4274
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD."
-#: ../dgit:4247
+#: ../dgit:4286
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
-#: ../dgit:4269
+#: ../dgit:4308
#, 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:4330
+#: ../dgit:4362
#, 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:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr "%s release %s voor %s (%s) [dgit]\n"
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-"%s release %s voor %s (%s)\n"
-"(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n"
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het nagaan van de toestand van het archief.\n"
-"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-"het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, "
-"gebruik dan --new"
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het voorbereiden van uw push.\n"
-"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen"
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-"Tak wordt beheerd door git-debrebase (%s\n"
-"bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n"
-"Gebruik de juiste --quilt-optie of pas uw git config aan.\n"
-"Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n"
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-"--quilt=%s maar geen gecachete dgit-weergave:\n"
-" werd HEAD misschien gewijzigd sinds dgit build[-source]?"
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-"dgit push: HEAD is geen afstammeling van de versie van het archief.\n"
-"Om de inhoud van het archief te overschrijven, geeft u de opdracht --"
-"overwrite[=VERSIE].\n"
-"Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt "
-"u --deliberately-not-fast-forward."
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr "bezig na te gaan dat %s overeenkomt met HEAD"
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr "HEAD geeft een andere boom op aan %s:\n"
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-"Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n"
-"Om alle verschillen te zien, gebruikt u git diff %s %s\n"
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-"Misschien vergat u te bouwen (build). Of er is misschien een probleem met\n"
-" uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te "
-"zien,\n"
-" gebruikt u git diff %s %s\n"
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-"kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet "
-"u dgit -C gebruiken"
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-"bezig met uploaden van binaire pakketten, hoewel het beleid van de "
-"distributie uitsluitend broncode (source only) voorschrijft"
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-"upload van uitsluitend broncode (source-only), hoewel het beleid van de "
-"distributie .deb's vereist"
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-"upload van uitsluitend broncode (source-only), hoewel pakket volledig NIEUW "
-"is\n"
-"(dit is in tegenspraak met de beleidsrichtlijnen in %s)"
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'"
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het ondertekenen van de tag.\n"
-"Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-"Push mislukte *na* het ondertekenen van de tag.\n"
-"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-"Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie de "
-"meldingen hierboven.\n"
-"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-"Push mislukte bij het verkrijgen van de ondertekening van .changes en .dsc.\n"
-"Indien het louter een mislukte ondertekening betreft, kunt u opnieuw "
-"proberen\n"
-"door handmatig het changes-bestand te ondertekenen met debsign (zie "
-"hierboven\n"
-"welk commando dgit gebruikte) en vervolgens het changes-bestand te uploaden\n"
-"met dput om zo de upload te vervolledigen.\n"
-"Indien u het pakket moet aanpassen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr "%s gepusht en geüpload"
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-"-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als "
-"argument"
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr "incorrecte argumenten voor dgit clone"
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr "%s bestaat reeds"
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr "verwijder %s: %s\n"
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr "controleer of %s moet verwijderd worden: %s\n"
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr "incorrecte argumenten voor dgit fetch of dgit pull"
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-"dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet "
-"ondersteund\n"
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr "dgit checkout heeft een suite nodig als argument"
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr "bezig met opzetten van vcs-git: %s\n"
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr "vcs git is reeds geconfigureerd: %s\n"
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr "url van vcs-git wordt veranderd naar: %s\n"
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr "bezig met ophalen (%s)\n"
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr "incorrecte argumenten voor dgit %s"
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-"dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel "
-"wordt %s opgegeven"
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-"de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van "
-"de aanroepende computer zijn %s"
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr "maak %s aan: %s"
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr "dochterproces op de bouwcomputer faalde: %s"
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr "alles klaar\n"
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr "bestand %s (%s) tweemaal"
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr "slechte parameter-spec"
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr "slechte vroegere spec"
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-"de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus "
-"%s niet ondersteunt"
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr "buildinfo-incongruentie in veld %s"
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr "buildinfo bevat ongeoorloofd veld %s"
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr "extern changes-bestand"
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr "geen echt bestand of symbolische koppeling\n"
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr "modus of type gewijzigd\n"
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr "symbolische koppeling gewijzigd\n"
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr "verwijdering van symbolische koppeling\n"
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr "creatie met een niet-standaard modus\n"
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr "dgit-weergave: er zijn wijzigingen vereist..."
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-"\n"
-"Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n"
-" %s\n"
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-"--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n"
-" (een git-boom zonder dat de patches toegepast worden)\n"
-" maar de git-boom verschilt van orig in de toeleveraarsbestanden."
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-"\n"
-" ... debian/patches ontbreekt; is dit misschien een tak met een patch-"
-"wachtrij?"
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-"--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n"
-" (een git-boom met toegepaste patches)\n"
-" maar de git-boom verschilt van het resultaat van het toepassen van\n"
-" debian/patches op de broncode van de toeleveraar.\n"
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-"dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt"
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-"--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om gebruikt\n"
-" te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n"
-" toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n"
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-"dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te "
-"representeren"
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-"%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op "
-"te tekenen"
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-"Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n"
-"\n"
-"De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n"
-".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n"
-"gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n"
-"de weergave van het pakket uit het officiële Debian-archief.\n"
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n"
-
-#: ../dgit:5499
-msgid "converted"
-msgstr "omgezet"
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr "dgit-weergave: gecreëerd: (%s)"
-
-#: ../dgit:5565
+#: ../dgit:5607
msgid "maximum search space exceeded"
msgstr "maximale zoekruimte overschreden"
-#: ../dgit:5583
+#: ../dgit:5625
#, perl-format
msgid "has %s not %s"
msgstr "bevat %s, niet %s"
-#: ../dgit:5592
+#: ../dgit:5634
msgid "root commit"
msgstr "beginvastlegging (root commit)"
-#: ../dgit:5598
+#: ../dgit:5640
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr "samenvoeging (merge) (%s niet-triviale ouders)"
-#: ../dgit:5610
+#: ../dgit:5652
#, perl-format
msgid "changed %s"
msgstr "gewijzigd: %s"
-#: ../dgit:5629
+#: ../dgit:5671
#, perl-format
msgid ""
"\n"
"\n"
"%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n"
-#: ../dgit:5636
+#: ../dgit:5678
#, perl-format
msgid "%s: %s: %s\n"
msgstr "%s: %s: %s\n"
-#: ../dgit:5648
+#: ../dgit:5690
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:5651
+#: ../dgit:5693
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
"de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..."
-#: ../dgit:5663
+#: ../dgit:5705
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
"Laatste (tot en met) %s git-wijzigingen, ter informatie:\n"
"\n"
-#: ../dgit:5670
+#: ../dgit:5712
msgid "quiltify linearisation planning successful, executing..."
msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..."
-#: ../dgit:5704
+#: ../dgit:5746
msgid "contains unexpected slashes\n"
msgstr "bevat onverwachte slashes\n"
-#: ../dgit:5705
+#: ../dgit:5747
msgid "contains leading punctuation\n"
msgstr "bevat leestekens aan het begin\n"
-#: ../dgit:5706
+#: ../dgit:5748
msgid "contains bad character(s)\n"
msgstr "bevat foutieve teken(s)\n"
-#: ../dgit:5707
+#: ../dgit:5749
msgid "is series file\n"
msgstr "is een series-bestand\n"
-#: ../dgit:5708
+#: ../dgit:5750
msgid "too long\n"
msgstr "te lang\n"
-#: ../dgit:5712
+#: ../dgit:5754
#, 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:5741
+#: ../dgit:5783
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr "dgit: fout bij de transliteratie van de patch-titel: %s"
+#: ../dgit:5866
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
#: ../dgit:5884
+msgid "converted"
+msgstr "omgezet"
+
+#: ../dgit:5885
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr "dgit-weergave: gecreëerd: (%s)"
+
+#: ../dgit:5939
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
"Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n"
-#: ../dgit:5894
+#: ../dgit:5949
msgid "starting quiltify (single-debian-patch)"
msgstr "quiltify wordt gestart (één enkele debian-patch)"
-#: ../dgit:5996
+#: ../dgit:6059
#, 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:6027
+#: ../dgit:6091
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr "dgit-weergave: gecachete (%s) aangetroffen"
-#: ../dgit:6032
+#: ../dgit:6096
msgid "dgit view: found cached, no changes required"
msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist"
-#: ../dgit:6043
+#: ../dgit:6131
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)"
-#: ../dgit:6134
+#: ../dgit:6245
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"
" dgit can enkel bepaalde soorten anomalieën repareren\n"
" (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n"
-#: ../dgit:6148
+#: ../dgit:6259
msgid "Tree already contains .pc - will use it then delete it."
msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen."
-#: ../dgit:6185
+#: ../dgit:6293
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6306
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6324
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6340
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6354
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6378
#, 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:6188
-#, perl-format
+#: ../dgit:6388
+#, fuzzy, perl-format
+#| msgid ""
+#| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
+#| "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
"%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt-verschillen: HEAD %s o+d/p HEAD %s o+d/p"
-#: ../dgit:6194
+#: ../dgit:6397
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr "dgit: kan wijziging niet representeren: %s: %s\n"
-#: ../dgit:6198
+#: ../dgit:6401
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:6205
+#: ../dgit:6408
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6412
msgid "This might be a patches-unapplied branch."
msgstr "Dit is mogelijk een tak zonder toepassing van patches."
-#: ../dgit:6208
+#: ../dgit:6415
msgid "This might be a patches-applied branch."
msgstr "Dit is mogelijk een tak met toegepaste patches."
-#: ../dgit:6211
+#: ../dgit:6418
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:6214
+#: ../dgit:6421
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
"Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)."
-#: ../dgit:6218
+#: ../dgit:6425
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:6227
+#: ../dgit:6436
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr "quiltify wordt gestart (meerdere patches, %s-modus)"
-#: ../dgit:6265
+#: ../dgit:6475
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
"dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n"
"\n"
-#: ../dgit:6277
+#: ../dgit:6487
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:6306
+#: ../dgit:6516
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"
"negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te "
"gebruiken.\n"
-#: ../dgit:6318
+#: ../dgit:6528
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
"de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven"
-#: ../dgit:6321
+#: ../dgit:6531
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:6324
+#: ../dgit:6534
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
"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:6342
+#: ../dgit:6547
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6564
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
"de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)"
-#: ../dgit:6356
+#: ../dgit:6578
msgid "clean takes no additional arguments"
msgstr "met clean kunnen geen extra argumenten opgegeven worden"
-#: ../dgit:6369
-#, perl-format
-msgid "-p is not allowed with dgit %s"
-msgstr "-p is niet toegestaan met dgit %s"
+#: ../dgit:6597
+#, 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:6408
+#: ../dgit:6607
+#, fuzzy
+#| msgid "dgit: --include-dirty is not supported in split view quilt mode"
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
+"weergave"
+
+#: ../dgit:6616
+#, fuzzy, perl-format
+#| msgid "dgit: import-dsc: %s"
+msgid "dgit: --quilt=%s, %s"
+msgstr "dgit: import-dsc: %s"
+
+#: ../dgit:6620
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6655
#, perl-format
msgid "remove old changes file %s: %s"
msgstr "verwijder oud changes-bestand %s: %s"
-#: ../dgit:6410
+#: ../dgit:6657
#, perl-format
msgid "would remove %s"
msgstr "zou %s verwijderen"
-#: ../dgit:6436
+#: ../dgit:6683
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:6442
+#: ../dgit:6689
#, perl-format
msgid "changelog will contain changes since %s"
msgstr "changelog zal wijzigingen sinds %s bevatten"
-#: ../dgit:6445
+#: ../dgit:6692
msgid "package seems new, not specifying -v<version>"
msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>"
-#: ../dgit:6488
+#: ../dgit:6735
msgid "Wanted to build nothing!"
msgstr "Wilde niets bouwen!"
-#: ../dgit:6526
+#: ../dgit:6773
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr "slechts één changes-bestand van bouw (%s)\n"
-#: ../dgit:6533
+#: ../dgit:6780
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten"
-#: ../dgit:6540
+#: ../dgit:6787
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw"
-#: ../dgit:6544
+#: ../dgit:6791
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr "installeer nieuw changes %s{,.inmulti}: %s"
-#: ../dgit:6549
+#: ../dgit:6796
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr "fout nummer van verschillende changes-bestanden (%s)"
-#: ../dgit:6552
+#: ../dgit:6799
#, perl-format
msgid "build successful, results in %s\n"
msgstr "bouw was succesvol, resultaten in %s\n"
-#: ../dgit:6565
+#: ../dgit:6812
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
"resultaat.\n"
"De suggestie is dat u %s verwijdert.\n"
-#: ../dgit:6583
+#: ../dgit:6830
msgid "build successful\n"
msgstr "de bouw was succesvol\n"
-#: ../dgit:6590
+#: ../dgit:6837
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
"%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen "
"gaan naar ..\n"
-#: ../dgit:6700
+#: ../dgit:6947
#, perl-format
msgid "remove %s: %s"
msgstr "verwijder %s: %s"
-#: ../dgit:6735
+#: ../dgit:6984
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry"
-#: ../dgit:6755
+#: ../dgit:7004
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s"
-#: ../dgit:6768
+#: ../dgit:7017
msgid "build-source takes no additional arguments"
msgstr "build-source moet zonder bijkomende argumenten gebruikt worden"
-#: ../dgit:6772
+#: ../dgit:7021
#, perl-format
msgid "source built, results in %s and %s"
msgstr "broncodepakket is gebouwd, resultaten in %s en %s"
-#: ../dgit:6779
+#: ../dgit:7028
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
"dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-"
"source!"
-#: ../dgit:6785
+#: ../dgit:7034
msgid "source changes file"
msgstr "broncode-changes-bestand"
-#: ../dgit:6787
+#: ../dgit:7036
msgid "user-specified changes file is not source-only"
msgstr ""
"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'"
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7056 ../dgit:7058
#, perl-format
msgid "%s (in build products dir): %s"
msgstr "%s (in bouwproductenmap): %s"
-#: ../dgit:6822
+#: ../dgit:7071
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"
"specifieke\n"
"binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n"
-#: ../dgit:6834
+#: ../dgit:7083
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
"u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair "
"pakket - is dit echt wat u bedoelde?"
-#: ../dgit:6838
+#: ../dgit:7087
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
"debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is "
"onmogelijk"
-#: ../dgit:6868
+#: ../dgit:7117
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr "foutieve argumenten voor dgit print-unapplied-treeish"
-#: ../dgit:6890
+#: ../dgit:7138
msgid "source tree"
msgstr "broncodeboom"
-#: ../dgit:6892
+#: ../dgit:7140
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr "dgit: import-dsc: %s"
-#: ../dgit:6905
+#: ../dgit:7153
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc"
-#: ../dgit:6909
+#: ../dgit:7157
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK"
-#: ../dgit:6913
+#: ../dgit:7161
msgid "dry run makes no sense with import-dsc"
msgstr "testuitvoering (dry run) is zinloos met import-dsc"
-#: ../dgit:6930
+#: ../dgit:7178
#, perl-format
msgid "%s is checked out - will not update it"
msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken"
-#: ../dgit:6935
+#: ../dgit:7183
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr "open import-.dsc (%s): %s"
-#: ../dgit:6937
+#: ../dgit:7185
#, perl-format
msgid "read %s: %s"
msgstr "lees %s: %s"
-#: ../dgit:6948
+#: ../dgit:7196
msgid "import-dsc signature check failed"
msgstr "controle ondertekening van import-dsc mislukte"
-#: ../dgit:6951
+#: ../dgit:7199
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n"
-#: ../dgit:6962
+#: ../dgit:7210
msgid "Dgit metadata in .dsc"
msgstr "Dgit-metadata in .dsc"
-#: ../dgit:6973
+#: ../dgit:7221
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:6982
+#: ../dgit:7230
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
"Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n"
"server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n"
-#: ../dgit:6989
+#: ../dgit:7237
msgid "Not fast forward, forced update."
msgstr "Niet lineair (fast forward), gedwongen update."
-#: ../dgit:6991
+#: ../dgit:7239
#, perl-format
msgid "Not fast forward to %s"
msgstr "Niet lineair (fast forward) naar %s"
-#: ../dgit:6996
+#: ../dgit:7244
#, perl-format
msgid "updated git ref %s"
msgstr "git ref %s geüpdatet"
-#: ../dgit:7001
+#: ../dgit:7249
#, perl-format
msgid ""
"Branch %s already exists\n"
"geschiedenis\n"
"Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n"
-#: ../dgit:7021
+#: ../dgit:7269
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr "lstat %s werkt maar stat geeft %s !"
-#: ../dgit:7023
+#: ../dgit:7271
#, perl-format
msgid "stat %s: %s"
msgstr "stat %s: %s"
-#: ../dgit:7031
+#: ../dgit:7279
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr "importeren van %s vereist %s, maar: %s"
-#: ../dgit:7050
+#: ../dgit:7298
#, 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:7054
+#: ../dgit:7302
#, perl-format
msgid "symlink %s to %s: %s"
msgstr "symbolische koppeling %s naar %s: %s"
-#: ../dgit:7055
+#: ../dgit:7303
#, perl-format
msgid "made symlink %s -> %s"
msgstr "maakte symbolische koppeling %s -> %s"
-#: ../dgit:7066
+#: ../dgit:7314
msgid "Import, forced update - synthetic orphan git history."
msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis."
-#: ../dgit:7068
+#: ../dgit:7316
msgid "Import, merging."
msgstr "Import, bezig met samenvoegen."
-#: ../dgit:7082
+#: ../dgit:7330
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr "Invoegen van import %s (%s) in %s\n"
-#: ../dgit:7091
+#: ../dgit:7339
#, perl-format
msgid "results are in git ref %s"
msgstr "resultaten staan in git ref %s"
-#: ../dgit:7098
+#: ../dgit:7346
msgid "need only 1 subpath argument"
msgstr "slechts 1 argument met een onderliggend pad nodig"
-#: ../dgit:7104
+#: ../dgit:7352
#, perl-format
msgid "exec curl: %s\n"
msgstr "exec curl: %s\n"
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr "bestemmingsargument nodig"
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr "exec git clone: %s\n"
-#: ../dgit:7131
+#: ../dgit:7379
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:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores"
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs"
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr "geen argumenten toegelaten bij dgit setup-useremail"
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr "geen argumenten toegelaten bij dgit setup-tree"
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
"--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map "
"op te geven."
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr "%s moet een waarde hebben"
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr "foute waarde `%s' voor %s"
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n"
-#: ../dgit:7368
+#: ../dgit:7620
#, perl-format
msgid "unknown long option `%s'"
msgstr "onbekende lange optie `%s'"
-#: ../dgit:7423
+#: ../dgit:7675
#, perl-format
msgid "unknown short option `%s'"
msgstr "onbekende korte optie `%s'"
-#: ../dgit:7438
+#: ../dgit:7690
#, 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:7442
+#: ../dgit:7694
#, perl-format
msgid "%s is blocked\n"
msgstr "%s is geblokkeerd\n"
-#: ../dgit:7448
+#: ../dgit:7700
#, perl-format
msgid ""
"On entry to dgit, %s\n"
"Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n"
"Er wordt opgegeven.\n"
-#: ../dgit:7465
+#: ../dgit:7717
#, perl-format
msgid "cannot set command for %s"
msgstr "kan commando voor %s niet instellen"
-#: ../dgit:7478
+#: ../dgit:7730
#, perl-format
msgid "cannot configure options for %s"
msgstr "kan opties voor %s niet configureren"
-#: ../dgit:7498
+#: ../dgit:7750
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr "onbekende quilt-modus `%s'"
-#: ../dgit:7508
+#: ../dgit:7761
#, perl-format
msgid "unknown %s setting `%s'"
msgstr "onbekende %s dat `%s' instelt"
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
-"weergave"
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr "onbekende clean-modus `%s'"
-
-#: ../dgit:7545
+#: ../dgit:7789
msgid "DRY RUN ONLY\n"
msgstr "ENKEL TESTUITVOERING (DRY RUN)\n"
-#: ../dgit:7546
+#: ../dgit:7790
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
"GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) "
"WIJZIGINGEN MAKEN\n"
-#: ../dgit:7565
+#: ../dgit:7809
#, perl-format
msgid "unknown operation %s"
msgstr "onbekende bewerking %s"
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
" ...\n"
"Zie git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr "%s: foutief gebruik: %s\n"
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr "foutieve opties volgen na `git-debrebase %s'"
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr "de vereiste git-configuratie %s ontbreekt"
-#: ../git-debrebase:401
+#: ../git-debrebase:364
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr "%s: moeilijkheid (snag) genegeerd (-f%s): %s\n"
-#: ../git-debrebase:404
+#: ../git-debrebase:367
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr "%s: moeilijkheid (snag) gevonden (-f%s): %s\n"
-#: ../git-debrebase:417
+#: ../git-debrebase:380
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
"%s: moeilijkheden (snags): %d overschreven door individuele -f opties\n"
-#: ../git-debrebase:423
+#: ../git-debrebase:386
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr "%s: moeilijkheden (snags): %d overschreven door het globale --force\n"
-#: ../git-debrebase:427
+#: ../git-debrebase:390
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
"%s: moeilijkheden (snags): %d blokker(s) (u zou -f<tag> of --force kunnen "
"gebruiken)"
-#: ../git-debrebase:459
+#: ../git-debrebase:422
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
"Tak/geschiedenis lijkt verknoeid - niet langer in gdr-indeling.\n"
"Zie ILLEGAL OPERATIONS (ongeldige bewerkingen) in git-debrebase(5).\n"
-#: ../git-debrebase:466
+#: ../git-debrebase:429
#, perl-format
msgid ""
"%s\n"
"%s\n"
"Zou dit een gdr-tak moeten zijn? %s\n"
-#: ../git-debrebase:471
+#: ../git-debrebase:434
#, perl-format
msgid ""
"%s\n"
"%s\n"
"Overweeg git-debrebase scrap, om uw recent werk weg te gooien.\n"
-#: ../git-debrebase:477
+#: ../git-debrebase:440
#, perl-format
msgid ""
"%s\n"
"Tak lijkt niet bedoeld te zijn als git-debrebase tak?\n"
"Foute tak, of misschien had u git-debrebase convert-from-* nodig.\n"
-#: ../git-debrebase:488
+#: ../git-debrebase:451
#, perl-format
msgid ""
"%s\n"
"Misschien voerde u een reset naar of een rebase van een ongepaste plaats "
"uit.\n"
-#: ../git-debrebase:935
+#: ../git-debrebase:898
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr "git-debrebase `anker' maar %s"
-#: ../git-debrebase:937
+#: ../git-debrebase:900
msgid "has other than two parents"
msgstr "heeft iets anders dan twee ouders"
-#: ../git-debrebase:938
+#: ../git-debrebase:901
msgid "contains debian/patches"
msgstr "bevat debian/patches"
-#: ../git-debrebase:964
+#: ../git-debrebase:927
msgid "is an origin commit"
msgstr "is een externe vastlegging (origin commit)"
-#: ../git-debrebase:966
+#: ../git-debrebase:929
msgid "upstream files differ from left parent"
msgstr "bestanden van de toeleveraar verschillen van de linkerouder"
-#: ../git-debrebase:968
+#: ../git-debrebase:931
msgid "debian/ differs from right parent"
msgstr "debian/ verschilt van de rechterouder"
-#: ../git-debrebase:979
+#: ../git-debrebase:942
msgid "edits debian/patches"
msgstr "bewerkt debian/patches"
-#: ../git-debrebase:991
+#: ../git-debrebase:954
msgid "parent's debian is not a directory"
msgstr "bij de ouder is debian geen map"
-#: ../git-debrebase:998
+#: ../git-debrebase:961
msgid "no changes"
msgstr "geen wijzigingen"
-#: ../git-debrebase:1004
+#: ../git-debrebase:967
msgid "origin commit"
msgstr "externe vastlegging (origin commit)"
-#: ../git-debrebase:1055
+#: ../git-debrebase:1018
#, perl-format
msgid "unknown kind of merge from %s"
msgstr "onbekend soort samenvoeging vanuit %s"
-#: ../git-debrebase:1058
+#: ../git-debrebase:1021
msgid "octopus merge"
msgstr "meervoudige samenvoeging (octopus merge)"
-#: ../git-debrebase:1062
+#: ../git-debrebase:1025
msgid "general two-parent merge"
msgstr "algemene twee-oudersamenvoeging (two-parent merge)"
-#: ../git-debrebase:1079
+#: ../git-debrebase:1042
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr "strijdige ankers in samengevoegde golfbrekers (merged-breakwaters) %s"
-#: ../git-debrebase:1119
+#: ../git-debrebase:1082
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s"
-#: ../git-debrebase:1147
+#: ../git-debrebase:1110
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr "wijziging (%s) bij het verpakken volgt de wijziging van de toeleveraar"
-#: ../git-debrebase:1148
+#: ../git-debrebase:1111
#, perl-format
msgid " (eg %s)"
msgstr " (bijv. %s)"
-#: ../git-debrebase:1154
+#: ../git-debrebase:1117
msgid "found mixed upstream/packaging commit"
msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1118 ../git-debrebase:1126 ../git-debrebase:1131
+#: ../git-debrebase:1136 ../git-debrebase:1142 ../git-debrebase:1150
#, perl-format
msgid " (%s)"
msgstr " (%s)"
-#: ../git-debrebase:1162
+#: ../git-debrebase:1125
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr "vastlegging in verband met uitwisselingsbeheer aangetroffen (%s)"
-#: ../git-debrebase:1167
+#: ../git-debrebase:1130
msgid "found dgit dsc import"
msgstr "dsc-import door dgit aangetroffen"
-#: ../git-debrebase:1172
+#: ../git-debrebase:1135
msgid "found bare dgit dsc import with no prior history"
msgstr ""
"kale dsc-import door dgit aangetroffen zonder voorafgaande geschiedenis"
-#: ../git-debrebase:1178
+#: ../git-debrebase:1141
msgid "found vanilla merge"
msgstr "standaardsamenvoeging (vanilla merge) aangetroffen"
-#: ../git-debrebase:1185
+#: ../git-debrebase:1148
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s"
-#: ../git-debrebase:1253
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om; %3$s: "
"(vastlegging %1$s) (d.%2$s)"
-#: ../git-debrebase:1254
+#: ../git-debrebase:1217
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: (vastlegging "
"%1$s) (d.%2$s)"
-#: ../git-debrebase:1375
+#: ../git-debrebase:1338
msgid "bare dgit dsc import"
msgstr "kale dsc-import door dgit"
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1678 ../git-debrebase:1681
#, perl-format
msgid "mismatch %s ?"
msgstr "discrepantie %s ?"
-#: ../git-debrebase:1721
+#: ../git-debrebase:1684
#, perl-format
msgid "mismatch %s != %s ?"
msgstr "discrepantie %s != %s ?"
-#: ../git-debrebase:1731
+#: ../git-debrebase:1694
#, perl-format
msgid "internal error %#x %s %s"
msgstr "interne fout %#x %s %s"
-#: ../git-debrebase:1759
+#: ../git-debrebase:1722
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr "%s: gewassen (laundered) (head was %s)\n"
-#: ../git-debrebase:1773
+#: ../git-debrebase:1736
msgid "you are in the middle of a git-rebase already"
msgstr "u bent reeds middenin een git-rebase"
-#: ../git-debrebase:1799
+#: ../git-debrebase:1762
msgid "launder for rebase"
msgstr "wassen (launder) voor rebase"
-#: ../git-debrebase:1804
+#: ../git-debrebase:1767
msgid "analyse does not support any options"
msgstr "analyse ondersteunt geen opties"
-#: ../git-debrebase:1806
+#: ../git-debrebase:1769
msgid "too many arguments to analyse"
msgstr "te veel argumenten om te analyseren"
-#: ../git-debrebase:1841
+#: ../git-debrebase:1802
+#, perl-format
+msgid "%s already exists"
+msgstr "%s bestaat reeds"
+
+#: ../git-debrebase:1804
msgid "HEAD symref is not to refs/heads/"
msgstr "HEAD symref wijst niet naar refs/heads/"
-#: ../git-debrebase:1864
+#: ../git-debrebase:1827
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr "Oké, u bent voor op %s\n"
-#: ../git-debrebase:1868
+#: ../git-debrebase:1831
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr "u bent achter op %s, gevaar voor uiteenlopen"
-#: ../git-debrebase:1872
+#: ../git-debrebase:1835
#, perl-format
msgid "you have diverged from %s"
msgstr "u bent uiteengelopen van %s"
-#: ../git-debrebase:1894
+#: ../git-debrebase:1857
msgid "remote dgit branch"
msgstr "externe dgit-tak"
-#: ../git-debrebase:1897
+#: ../git-debrebase:1860
msgid "remote dgit branch for sid"
msgstr "externe dgit-tak voor sid"
-#: ../git-debrebase:1925
+#: ../git-debrebase:1888
msgid "Recorded previous head for preservation"
msgstr "Vorige head voor behoud opgetekend"
-#: ../git-debrebase:1933
+#: ../git-debrebase:1896
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr "kon ffq-prev niet optekenen: %s"
-#: ../git-debrebase:1944
+#: ../git-debrebase:1907
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr "kon ffq-prev niet controleren: %s"
-#: ../git-debrebase:1964
+#: ../git-debrebase:1927
msgid "fast forward"
msgstr "lineair (fast forward)"
-#: ../git-debrebase:1974
+#: ../git-debrebase:1937
msgid "Declare fast forward / record previous work"
msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk"
-#: ../git-debrebase:1986
+#: ../git-debrebase:1949
msgid "No ffq-prev to stitch."
msgstr "Geen ffq-prev om te borduren."
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-"Kon geen passende toeleveraar-commitish bepalen.\n"
-" (Probeerde deze tags: %s)\n"
-" Controleer versie en geef toeleveraar-commitish expliciet op."
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1966
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig"
-#: ../git-debrebase:2041
+#: ../git-debrebase:1971
#, perl-format
msgid "bad version number `%s'"
msgstr "fout versienummer `%s'"
-#: ../git-debrebase:2059
+#: ../git-debrebase:1989
#, perl-format
msgid "upstream piece `%s'"
msgstr "toeleveraarsstuk `%s'"
-#: ../git-debrebase:2060
+#: ../git-debrebase:1990
msgid "upstream (main piece"
msgstr "van de toeleveraar (belangrijkste stuk"
-#: ../git-debrebase:2080
+#: ../git-debrebase:2010
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig"
-#: ../git-debrebase:2098
+#: ../git-debrebase:2028
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr ""
"oud anker werd herkend omwille van --anchor, kan niet controleren bij "
"toeleveraar"
-#: ../git-debrebase:2114
+#: ../git-debrebase:2044
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per "
"stuk plus misschien een eerdere combinatie)"
-#: ../git-debrebase:2123
+#: ../git-debrebase:2053
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
"eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet "
"`.'"
-#: ../git-debrebase:2136
+#: ../git-debrebase:2066
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-"
"combine'-vastlegging"
-#: ../git-debrebase:2147
+#: ../git-debrebase:2077
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr "toeleveraarsstuk `%s' wordt ingevoerd"
-#: ../git-debrebase:2150
+#: ../git-debrebase:2080
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr "toeleveraarsstuk `%s' wordt weggelaten"
-#: ../git-debrebase:2153
+#: ../git-debrebase:2083
#, perl-format
msgid "not fast forward: %s %s"
msgstr "niet lineair (fast forward): %s %s"
-#: ../git-debrebase:2264
+#: ../git-debrebase:2194
msgid "Previous head already recorded\n"
msgstr "Vorige head reeds opgenomen\n"
-#: ../git-debrebase:2268
+#: ../git-debrebase:2198
#, perl-format
msgid "Could not preserve: %s"
msgstr "Niet in staat te behouden: %s"
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2203 ../git-debrebase:2209 ../git-debrebase:2215
+#: ../git-debrebase:2305 ../git-debrebase:2314 ../git-debrebase:2338
+#: ../git-debrebase:2402
msgid "no arguments allowed"
msgstr "geen argumenten toegelaten"
-#: ../git-debrebase:2307
+#: ../git-debrebase:2237
msgid "branch contains furniture (not laundered)"
msgstr "tak bevat stoffering (niet gewassen)"
-#: ../git-debrebase:2308
+#: ../git-debrebase:2238
msgid "branch is unlaundered"
msgstr "tak is ongewassen (unlaundered)"
-#: ../git-debrebase:2309
+#: ../git-debrebase:2239
msgid "branch needs laundering"
msgstr "tak heeft wasbeurt nodig"
-#: ../git-debrebase:2310
+#: ../git-debrebase:2240
msgid "branch not in git-debrebase form"
msgstr "tak is niet in git-debrebase-indeling"
-#: ../git-debrebase:2320
+#: ../git-debrebase:2250
msgid "current branch contents, in git-debrebase terms:\n"
msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n"
-#: ../git-debrebase:2322
+#: ../git-debrebase:2252
msgid " branch is laundered\n"
msgstr " tak is gewassen\n"
-#: ../git-debrebase:2338
+#: ../git-debrebase:2268
#, perl-format
msgid " %s is not well-defined\n"
msgstr " %s is niet goed gedefinieerd\n"
-#: ../git-debrebase:2344
+#: ../git-debrebase:2274
msgid "key git-debrebase commits:\n"
msgstr "kern-git-debrebase-vastleggingen:\n"
-#: ../git-debrebase:2345
+#: ../git-debrebase:2275
msgid "anchor"
msgstr "anker"
-#: ../git-debrebase:2346
+#: ../git-debrebase:2276
msgid "breakwater"
msgstr "golfbreker (breakwater)"
-#: ../git-debrebase:2351
+#: ../git-debrebase:2281
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n"
-#: ../git-debrebase:2358
+#: ../git-debrebase:2288
msgid " unstitched; previous tip was:\n"
msgstr " borduursel losgemaakt; vorige tip was:\n"
-#: ../git-debrebase:2361
+#: ../git-debrebase:2291
msgid " stitched? (no record of git-debrebase work)\n"
msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n"
-#: ../git-debrebase:2363
+#: ../git-debrebase:2293
msgid " stitched\n"
msgstr " geborduurd\n"
-#: ../git-debrebase:2365
+#: ../git-debrebase:2295
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n"
-#: ../git-debrebase:2368
+#: ../git-debrebase:2298
msgid "you are currently rebasing\n"
msgstr "u bent momenteel aan het rebasen\n"
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2315 ../git-debrebase:2328
msgid "launder for git-debrebase quick"
msgstr "wassen voor git-debrebase quick"
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2322 ../git-debrebase:2352
msgid "No ongoing git-debrebase session."
msgstr "Geen lopende git-debrebase-sessie."
-#: ../git-debrebase:2461
+#: ../git-debrebase:2391
msgid "Commit patch queue (exported by git-debrebase)"
msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)"
-#: ../git-debrebase:2478
+#: ../git-debrebase:2408
msgid "No (more) patches to export."
msgstr "Geen (andere) patches die geëxporteerd moeten worden."
-#: ../git-debrebase:2485
+#: ../git-debrebase:2415
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s "
"gestaakt). Probeer eerst een wasbeurt te doen."
-#: ../git-debrebase:2505
+#: ../git-debrebase:2435
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr "%s bevat commentaar die verwijderd zal worden"
-#: ../git-debrebase:2510
+#: ../git-debrebase:2440
#, perl-format
msgid "patch %s repeated in %s !"
msgstr "patch %s herhaald in %s !"
-#: ../git-debrebase:2517
+#: ../git-debrebase:2447
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden"
-#: ../git-debrebase:2525
+#: ../git-debrebase:2455
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!"
-#: ../git-debrebase:2530
+#: ../git-debrebase:2460
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!"
-#: ../git-debrebase:2546
+#: ../git-debrebase:2476
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
"wil slechts 1 facultatief argument, de git commitish van de toeleveraar"
-#: ../git-debrebase:2551
+#: ../git-debrebase:2481
msgid "missing Version from changelog\n"
msgstr "Version vanuit de changelog wordt gemist\n"
-#: ../git-debrebase:2567
+#: ../git-debrebase:2497
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
"commando uit:\n"
" git diff %s HEAD -- :!/debian :/\n"
-#: ../git-debrebase:2575
+#: ../git-debrebase:2505
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr "upstream (%s) is geen voorouder van HEAD"
-#: ../git-debrebase:2582
+#: ../git-debrebase:2512
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-"
"unapplied)(geen toepassing van patches) is?"
-#: ../git-debrebase:2584
+#: ../git-debrebase:2514
#, perl-format
msgid "list expected changes with: %s\n"
msgstr "toon verwachte wijzigingen met: %s\n"
-#: ../git-debrebase:2591
+#: ../git-debrebase:2521
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr "upstream (%s) bevat een map debian/"
-#: ../git-debrebase:2609
+#: ../git-debrebase:2539
msgid "neither of the first two changelog entries are released\n"
msgstr ""
"geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n"
-#: ../git-debrebase:2615
+#: ../git-debrebase:2545
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n"
-#: ../git-debrebase:2618
+#: ../git-debrebase:2548
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!"
-#: ../git-debrebase:2621
+#: ../git-debrebase:2551
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr "dgit-weergavetag %s niet gevonden\n"
-#: ../git-debrebase:2623
+#: ../git-debrebase:2553
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n"
-#: ../git-debrebase:2625
+#: ../git-debrebase:2555
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr "zal borduren in de dgit-weergave, %s\n"
-#: ../git-debrebase:2632
+#: ../git-debrebase:2562
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
"Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n"
"dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n"
-#: ../git-debrebase:2678
+#: ../git-debrebase:2608
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
"%s: omgezet vanuit de indeling van de tak zonder toepassing van patches "
"(patched-unapplied) (gbp), Oké\n"
-#: ../git-debrebase:2707
+#: ../git-debrebase:2637
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
"%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n"
"%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n"
-#: ../git-debrebase:2728
+#: ../git-debrebase:2658
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
"heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)"
-#: ../git-debrebase:2736
+#: ../git-debrebase:2666
#, perl-format
msgid "%s, from command line"
msgstr "%s, van de commandoregel"
-#: ../git-debrebase:2750
+#: ../git-debrebase:2680
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
"%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n"
"%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n"
-#: ../git-debrebase:2754
+#: ../git-debrebase:2684
msgid "Branch already in git-debrebase format."
msgstr "Tak is reeds in git-debrebase-indeling."
-#: ../git-debrebase:2766
+#: ../git-debrebase:2696
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
"Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de "
"toeleveraar:\n"
-#: ../git-debrebase:2773
+#: ../git-debrebase:2703
#, perl-format
msgid "git tag %s"
msgstr "git tag %s"
-#: ../git-debrebase:2779
+#: ../git-debrebase:2709
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n"
-#: ../git-debrebase:2788
+#: ../git-debrebase:2718
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr "opendir build-products-dir %s: %s"
-#: ../git-debrebase:2794
+#: ../git-debrebase:2724
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n"
-#: ../git-debrebase:2825
+#: ../git-debrebase:2755
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n"
-#: ../git-debrebase:2834
+#: ../git-debrebase:2764
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
"Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de "
"toeleveraar:\n"
-#: ../git-debrebase:2871
+#: ../git-debrebase:2801
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr " %s: kon patches niet toepassen: gbp pq %s"
-#: ../git-debrebase:2880
+#: ../git-debrebase:2810
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr " %s: patches toepassen geeft een afwijkende boom\n"
-#: ../git-debrebase:2894
+#: ../git-debrebase:2824
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"of geef expliciet een vastlegging van de toeleveraar op,\n"
"of bezorg geschikte origs.\n"
-#: ../git-debrebase:2900
+#: ../git-debrebase:2830
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr "Ja, zal nieuwe tak baseren op %s\n"
-#: ../git-debrebase:2907
+#: ../git-debrebase:2837
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt"
-#: ../git-debrebase:2911
+#: ../git-debrebase:2841
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
"Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s"
-#: ../git-debrebase:3013
+#: ../git-debrebase:2943
msgid "bad options\n"
msgstr "foute opties\n"
-#: ../git-debrebase:3023
+#: ../git-debrebase:2953
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr "%s: niet gek van -i voor git-rebase"
-#: ../git-debrebase:3053
+#: ../git-debrebase:2983
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr "onbekende onderliggende bewerking van git-debrebase: %s"
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:293
#, perl-format
msgid "error: %s\n"
msgstr "fout: %s\n"
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:319
#, perl-format
msgid "getcwd failed: %s\n"
msgstr "getcwd mislukte: %s\n"
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:338
msgid "terminated, reporting successful completion"
msgstr "beëindigd, met de melding van een succesvolle voltooiing"
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:340
#, perl-format
msgid "failed with error exit status %s"
msgstr "mislukt met de foutmelding %s"
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "died due to fatal signal %s"
msgstr "gestorven vanwege fataal signaal %s"
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:347
#, perl-format
msgid "failed with unknown wait status %s"
msgstr "mislukt met ongekende wachttoestand %s"
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:353
msgid "failed command"
msgstr "mislukt commando"
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:359
#, perl-format
msgid "failed to fork/exec: %s"
msgstr "fork/exec is mislukt: %s"
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:361
#, perl-format
msgid "subprocess %s"
msgstr "onderliggend proces %s"
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:363
msgid "subprocess produced invalid output"
msgstr "onderliggend proces produceerde ongeldige uitvoer"
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:454
msgid "stat source file: %S"
msgstr "stat bronbestand: %S"
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:464
msgid "stat destination file: %S"
msgstr "stat doelbestand: %S"
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:483
msgid "finally install file after cp: %S"
msgstr "tot slot, installeer bestand na cp: %S"
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:489
msgid "delete old file after cp: %S"
msgstr "verwijder oud bestand na cp: %S"
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:510
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
"niet in een git werkboom?\n"
"(git rev-parse --show-toplevel gaf geen uitvoer)\n"
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:513
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr "chdir naar hoogste niveau %s: %s\n"
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:621
msgid "git index contains changes (does not match HEAD)"
msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:622
msgid "working tree is dirty (does not match HEAD)"
msgstr "werkboom is bevuild (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:644
+#, fuzzy
+#| msgid "found mixed upstream/packaging commit"
+msgid "using specified upstream commitish"
+msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
+
+#: ../Debian/Dgit.pm:650
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+"Kon geen passende toeleveraar-commitish bepalen.\n"
+" (Probeerde deze tags: %s)\n"
+" Controleer versie en geef toeleveraar-commitish expliciet op."
+
+#: ../Debian/Dgit.pm:656 ../Debian/Dgit.pm:658
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:764
msgid "detached HEAD"
msgstr "vrijstaande HEAD (detached HEAD)"
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:765
msgid "HEAD symref is not to refs/"
msgstr "symbolische referentie HEAD is geen referentie naar refs/"
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:781
#, perl-format
msgid "parsing of %s failed"
msgstr "ontleden van %s mislukte"
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:790
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit "
"push het .dsc moet aanpassen en het dan zelf moet ondertekenen"
-#: ../Debian/Dgit.pm:729
+#: ../Debian/Dgit.pm:804
#, perl-format
msgid "open %s (%s): %s"
msgstr "open %s (%s): %s"
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:825
#, perl-format
msgid "missing field %s in %s"
msgstr "ontbrekend veld %s in %s"
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:911
msgid "Dummy commit - do not use\n"
msgstr "Voorbeeldvastlegging - niet gebruiken\n"
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:932
#, perl-format
msgid "exec %s: %s\n"
msgstr "exec %s: %s\n"
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1000
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr "kan status van %s/.git niet verkrijgen: %s"
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1023
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr "mkdir van speelplaatsouder %s mislukte: %s"
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1031
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr "mkdir van een speelplaats %s mislukte: %s"
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1040
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr "mkdir van de speelplaats %s mislukte: %s"
+#~ msgid "Import %s"
+#~ msgstr "Importeren van %s"
+
+#~ msgid "Record %s (%s) in archive suite %s\n"
+#~ msgstr "Gegeven %s (%s) uit archiefsuite %s\n"
+
+#~ msgid "Not updating %s from %s to %s.\n"
+#~ msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n"
+
+#~ msgid "%s: NO git hash"
+#~ msgstr "%s: GEEN hash van git"
+
+#~ msgid "%s: specified git info (%s)"
+#~ msgstr "%s: git info werd opgegeven (%s)"
+
+#~ msgid "%s: specified git hash"
+#~ msgstr "%s: git hash werd opgegeven"
+
+#~ msgid "%s: invalid Dgit info"
+#~ msgstr "%s: ongeldige Dgit info"
+
+#~ msgid "%s release %s for %s (%s) [dgit]\n"
+#~ msgstr "%s release %s voor %s (%s) [dgit]\n"
+
+#~ msgid ""
+#~ "%s release %s for %s (%s)\n"
+#~ "(maintainer view tag generated by dgit --quilt=%s)\n"
+#~ msgstr ""
+#~ "%s release %s voor %s (%s)\n"
+#~ "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n"
+
+#~ msgid ""
+#~ "Push failed, while checking state of the archive.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het nagaan van de toestand van het archief.\n"
+#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
+#~ "probleem.\n"
+
+#~ msgid ""
+#~ "package appears to be new in this suite; if this is intentional, use --new"
+#~ msgstr ""
+#~ "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling "
+#~ "is, gebruik dan --new"
+
+#~ msgid ""
+#~ "Push failed, while preparing your push.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het voorbereiden van uw push.\n"
+#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
+#~ "probleem.\n"
+
+#~ msgid "looked for .dsc %s, but %s; maybe you forgot to build"
+#~ msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen"
+
+#~ msgid ""
+#~ "Branch is managed by git-debrebase (%s\n"
+#~ "exists), but quilt mode (%s) implies a split view.\n"
+#~ "Pass the right --quilt option or adjust your git config.\n"
+#~ "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
+#~ msgstr ""
+#~ "Tak wordt beheerd door git-debrebase (%s\n"
+#~ "bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n"
+#~ "Gebruik de juiste --quilt-optie of pas uw git config aan.\n"
+#~ "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n"
+
+#~ msgid ""
+#~ "--quilt=%s but no cached dgit view:\n"
+#~ " perhaps HEAD changed since dgit build[-source] ?"
+#~ msgstr ""
+#~ "--quilt=%s maar geen gecachete dgit-weergave:\n"
+#~ " werd HEAD misschien gewijzigd sinds dgit build[-source]?"
+
+#~ msgid ""
+#~ "dgit push: HEAD is not a descendant of the archive's version.\n"
+#~ "To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
+#~ "To rewind history, if permitted by the archive, use --deliberately-not-"
+#~ "fast-forward."
+#~ msgstr ""
+#~ "dgit push: HEAD is geen afstammeling van de versie van het archief.\n"
+#~ "Om de inhoud van het archief te overschrijven, geeft u de opdracht --"
+#~ "overwrite[=VERSIE].\n"
+#~ "Om de geschiedenis terug te spoelen, als het archief dat toestaat, "
+#~ "gebruikt u --deliberately-not-fast-forward."
+
+#~ msgid "checking that %s corresponds to HEAD"
+#~ msgstr "bezig na te gaan dat %s overeenkomt met HEAD"
+
+#~ msgid "HEAD specifies a different tree to %s:\n"
+#~ msgstr "HEAD geeft een andere boom op aan %s:\n"
+
+#~ msgid ""
+#~ "There is a problem with your source tree (see dgit(7) for some hints).\n"
+#~ "To see a full diff, run git diff %s %s\n"
+#~ msgstr ""
+#~ "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n"
+#~ "Om alle verschillen te zien, gebruikt u git diff %s %s\n"
+
+#~ msgid ""
+#~ "Perhaps you forgot to build. Or perhaps there is a problem with your\n"
+#~ " source tree (see dgit(7) for some hints). To see a full diff, run\n"
+#~ " git diff %s %s\n"
+#~ msgstr ""
+#~ "Misschien vergat u te bouwen (build). Of er is misschien een probleem "
+#~ "met\n"
+#~ " uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te "
+#~ "zien,\n"
+#~ " gebruikt u git diff %s %s\n"
+
+#~ msgid ""
+#~ "failed to find unique changes file (looked for %s in %s); perhaps you "
+#~ "need to use dgit -C"
+#~ msgstr ""
+#~ "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien "
+#~ "moet u dgit -C gebruiken"
+
+#~ msgid "uploading binaries, although distro policy is source only"
+#~ msgstr ""
+#~ "bezig met uploaden van binaire pakketten, hoewel het beleid van de "
+#~ "distributie uitsluitend broncode (source only) voorschrijft"
+
+#~ msgid "source-only upload, although distro policy requires .debs"
+#~ msgstr ""
+#~ "upload van uitsluitend broncode (source-only), hoewel het beleid van de "
+#~ "distributie .deb's vereist"
+
+#~ msgid ""
+#~ "source-only upload, even though package is entirely NEW\n"
+#~ "(this is contrary to policy in %s)"
+#~ msgstr ""
+#~ "upload van uitsluitend broncode (source-only), hoewel pakket volledig "
+#~ "NIEUW is\n"
+#~ "(dit is in tegenspraak met de beleidsrichtlijnen in %s)"
+
+#~ msgid "unknown source-only-uploads policy `%s'"
+#~ msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'"
+
+#~ msgid ""
+#~ "Push failed, while signing the tag.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het ondertekenen van de tag.\n"
+#~ "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van "
+#~ "het probleem.\n"
+
+#~ msgid ""
+#~ "Push failed, *after* signing the tag.\n"
+#~ "If you want to try again, you should use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte *na* het ondertekenen van de tag.\n"
+#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid ""
+#~ "Push failed, while updating the remote git repository - see messages "
+#~ "above.\n"
+#~ "If you want to try again, you should use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie "
+#~ "de meldingen hierboven.\n"
+#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid ""
+#~ "Push failed, while obtaining signatures on the .changes and .dsc.\n"
+#~ "If it was just that the signature failed, you may try again by using\n"
+#~ "debsign by hand to sign the changes file (see the command dgit tried,\n"
+#~ "above), and then dput that changes file to complete the upload.\n"
+#~ "If you need to change the package, you must use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte bij het verkrijgen van de ondertekening van .changes en ."
+#~ "dsc.\n"
+#~ "Indien het louter een mislukte ondertekening betreft, kunt u opnieuw "
+#~ "proberen\n"
+#~ "door handmatig het changes-bestand te ondertekenen met debsign (zie "
+#~ "hierboven\n"
+#~ "welk commando dgit gebruikte) en vervolgens het changes-bestand te "
+#~ "uploaden\n"
+#~ "met dput om zo de upload te vervolledigen.\n"
+#~ "Indien u het pakket moet aanpassen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid "pushed and uploaded %s"
+#~ msgstr "%s gepusht en geüpload"
+
+#~ msgid "-p is not allowed with clone; specify as argument instead"
+#~ msgstr ""
+#~ "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op "
+#~ "als argument"
+
+#~ msgid "incorrect arguments to dgit clone"
+#~ msgstr "incorrecte argumenten voor dgit clone"
+
+#~ msgid "remove %s: %s\n"
+#~ msgstr "verwijder %s: %s\n"
+
+#~ msgid "check whether to remove %s: %s\n"
+#~ msgstr "controleer of %s moet verwijderd worden: %s\n"
+
+#~ msgid "incorrect arguments to dgit fetch or dgit pull"
+#~ msgstr "incorrecte argumenten voor dgit fetch of dgit pull"
+
+#~ msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
+#~ msgstr ""
+#~ "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet "
+#~ "ondersteund\n"
+
+#~ msgid "dgit checkout needs a suite argument"
+#~ msgstr "dgit checkout heeft een suite nodig als argument"
+
+#~ msgid "setting up vcs-git: %s\n"
+#~ msgstr "bezig met opzetten van vcs-git: %s\n"
+
+#~ msgid "vcs git already configured: %s\n"
+#~ msgstr "vcs git is reeds geconfigureerd: %s\n"
+
+#~ msgid "changing vcs-git url to: %s\n"
+#~ msgstr "url van vcs-git wordt veranderd naar: %s\n"
+
+#~ msgid "fetching (%s)\n"
+#~ msgstr "bezig met ophalen (%s)\n"
+
+#~ msgid "incorrect arguments to dgit %s"
+#~ msgstr "incorrecte argumenten voor dgit %s"
+
+#~ msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
+#~ msgstr ""
+#~ "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel "
+#~ "wordt %s opgegeven"
+
+#~ msgid ""
+#~ "build host has dgit rpush protocol versions %s but invocation host has %s"
+#~ msgstr ""
+#~ "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die "
+#~ "van de aanroepende computer zijn %s"
+
+#~ msgid "create %s: %s"
+#~ msgstr "maak %s aan: %s"
+
+#~ msgid "build host child failed: %s"
+#~ msgstr "dochterproces op de bouwcomputer faalde: %s"
+
+#~ msgid "all done\n"
+#~ msgstr "alles klaar\n"
+
+#~ msgid "file %s (%s) twice"
+#~ msgstr "bestand %s (%s) tweemaal"
+
+#~ msgid "bad param spec"
+#~ msgstr "slechte parameter-spec"
+
+#~ msgid "bad previously spec"
+#~ msgstr "slechte vroegere spec"
+
+#~ msgid ""
+#~ "rpush negotiated protocol version %s which does not support quilt mode %s"
+#~ msgstr ""
+#~ "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-"
+#~ "modus %s niet ondersteunt"
+
+#~ msgid "buildinfo mismatch in field %s"
+#~ msgstr "buildinfo-incongruentie in veld %s"
+
+#~ msgid "buildinfo contains forbidden field %s"
+#~ msgstr "buildinfo bevat ongeoorloofd veld %s"
+
+#~ msgid "remote changes file"
+#~ msgstr "extern changes-bestand"
+
+#~ msgid "not a plain file or symlink\n"
+#~ msgstr "geen echt bestand of symbolische koppeling\n"
+
+#~ msgid "mode or type changed\n"
+#~ msgstr "modus of type gewijzigd\n"
+
+#~ msgid "modified symlink\n"
+#~ msgstr "symbolische koppeling gewijzigd\n"
+
+#~ msgid "deletion of symlink\n"
+#~ msgstr "verwijdering van symbolische koppeling\n"
+
+#~ msgid "creation with non-default mode\n"
+#~ msgstr "creatie met een niet-standaard modus\n"
+
+#~ msgid "dgit view: changes are required..."
+#~ msgstr "dgit-weergave: er zijn wijzigingen vereist..."
+
+#~ msgid ""
+#~ "\n"
+#~ "For full diff showing the problem(s), type:\n"
+#~ " %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n"
+#~ " %s\n"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying patches-unapplied git tree\n"
+#~ " but git tree differs from orig in upstream files."
+#~ msgstr ""
+#~ "--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n"
+#~ " (een git-boom zonder dat de patches toegepast worden)\n"
+#~ " maar de git-boom verschilt van orig in de toeleveraarsbestanden."
+
+#~ msgid ""
+#~ "\n"
+#~ " ... debian/patches is missing; perhaps this is a patch queue branch?"
+#~ msgstr ""
+#~ "\n"
+#~ " ... debian/patches ontbreekt; is dit misschien een tak met een patch-"
+#~ "wachtrij?"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying patches-applied git tree\n"
+#~ " but git tree differs from result of applying debian/patches to upstream\n"
+#~ msgstr ""
+#~ "--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n"
+#~ " (een git-boom met toegepaste patches)\n"
+#~ " maar de git-boom verschilt van het resultaat van het toepassen van\n"
+#~ " debian/patches op de broncode van de toeleveraar.\n"
+
+#~ msgid "dgit view: creating patches-applied version using gbp pq"
+#~ msgstr ""
+#~ "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying that HEAD is for use with a\n"
+#~ " tool which does not create patches for changes to upstream\n"
+#~ " .gitignores: but, such patches exist in debian/patches.\n"
+#~ msgstr ""
+#~ "--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om "
+#~ "gebruikt\n"
+#~ " te worden met een hulpmiddel dat geen patches maakt om .gitignores van "
+#~ "de\n"
+#~ " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke "
+#~ "patches.\n"
+
+#~ msgid "dgit view: creating patch to represent .gitignore changes"
+#~ msgstr ""
+#~ "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore "
+#~ "te representeren"
+
+#~ msgid ""
+#~ "%s already exists; but want to create it to record .gitignore changes"
+#~ msgstr ""
+#~ "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore "
+#~ "op te tekenen"
+
+#~ msgid ""
+#~ "Subject: Update .gitignore from Debian packaging branch\n"
+#~ "\n"
+#~ "The Debian packaging git branch contains these updates to the upstream\n"
+#~ ".gitignore file(s). This patch is autogenerated, to provide these\n"
+#~ "updates to users of the official Debian archive view of the package.\n"
+#~ msgstr ""
+#~ "Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n"
+#~ "\n"
+#~ "De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n"
+#~ ".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n"
+#~ "gegenereerd om deze updates ter beschikking te stellen van gebruikers "
+#~ "van\n"
+#~ "de weergave van het pakket uit het officiële Debian-archief.\n"
+
+#~ msgid "Commit patch to update .gitignore\n"
+#~ msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n"
+
+#~ msgid "-p is not allowed with dgit %s"
+#~ msgstr "-p is niet toegestaan met dgit %s"
+
+#~ msgid "unknown clean-mode `%s'"
+#~ msgstr "onbekende clean-modus `%s'"
+
#~ msgid "import %s requires .../%s, but it does not exist"
#~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
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
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335
-#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67
-#: ../dgit-maint-debrebase.7.pod:326
+#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
+#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
+#: ../dgit-maint-debrebase.7.pod:352
msgid "When upstream tags releases in git"
msgstr ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402
-#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388
+#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
+#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
#, no-wrap
msgid ""
" % git deborig\n"
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343
-#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137
-#: ../dgit-maint-debrebase.7.pod:334
+#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137
+msgid "Using untagged upstream commits"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141
+msgid ""
+"Sometimes upstream does not tag their releases, or you want to package an "
+"unreleased git snapshot. In such a case you can create your own upstream "
+"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream "
+"version you plan to put in I<debian/changelog>. The B<upstream/> prefix "
+"ensures that your tag will not clash with any tags upstream later creates."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148
+msgid ""
+"For example, suppose that the latest upstream release is 1.2.2 and you want "
+"to package git commit ab34c21 which was made on 2013-12-11. A common "
+"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 "
+"and so you could use"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155
+#, no-wrap
+msgid ""
+" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159
+msgid "to obtain a release tag, and then proceed as above."
+msgstr ""
+
+#. type: =head3
+#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
+#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
+#: ../dgit-maint-debrebase.7.pod:364
msgid "When upstream releases only tarballs"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145
+#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
#, no-wrap
msgid ""
" % mkdir foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151
+#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
msgid "Now create I<debian/gbp.conf>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155
+#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
#, no-wrap
msgid ""
" [DEFAULT]\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160
+#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
#, no-wrap
msgid ""
" sign-tags = True\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164
+#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
#, no-wrap
msgid ""
" [import-orig]\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169
+#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173
+#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
#, no-wrap
msgid ""
" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
+#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
msgid "Then we can import the upstream version:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185
+#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
#, no-wrap
msgid ""
" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189
+#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
msgid ""
"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
"need it whenever we import a new upstream version, we must push it "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
+#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
#, no-wrap
msgid ""
" % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207
+#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
msgid "CONVERTING AN EXISTING PACKAGE"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209
+#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
msgid ""
"This section explains how to convert an existing Debian package to this "
"workflow. It should be skipped when debianising a new package."
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240
+#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
#, no-wrap
msgid ""
" % git remote add -f upstream https://some.upstream/foo.git\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294
+#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
msgid ""
"To achieve this, you might need to delete I<debian/source/local-options>. "
"One way to have dgit check your progress is to run B<dgit build-source>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441
+#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
msgid "BUILDING AND UPLOADING"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324
+#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
msgid "Obtaining the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330
+#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
" % git remote update\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336
+#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
+msgid ""
+"If you want to package an untagged upstream commit (because upstream does "
+"not tag releases or because you want to package an upstream development "
+"snapshot), see \"Using untagged upstream commits\" above."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
msgid ""
"You will need the I<debian/gbp.conf> from \"When upstream releases only "
"tarballs\", above. You will also need your upstream branch. Above, we "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341
+#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
msgid "Then, either"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345
+#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
#, no-wrap
msgid ""
" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349
+#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
msgid "or if you have a working watch file"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:353
+#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
#, no-wrap
msgid ""
" % gbp import-orig --no-merge --uscan\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382
+#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
msgid ""
"If you obtained a tarball from upstream, you are ready to try a build. If "
"you merged a git tag from upstream, you will first need to generate a "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472
+#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
msgid "HANDLING DFSG-NON-FREE MATERIAL"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546
+#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
msgid ""
"The easiest way to handle this is to add a B<Files-Excluded> field to "
"I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130
-#: ../dgit-maint-debrebase.7.pod:551
+#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
+#: ../dgit-maint-debrebase.7.pod:582
msgid "INCORPORATING NMUS"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140
-#: ../dgit-maint-debrebase.7.pod:751
+#: ../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:228
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753
+#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>. It contains contributions from other dgit "
msgstr ""
#. type: =head1
-#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298
+#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324
msgid "GIT CONFIGURATION"
msgstr ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:139
+#: ../dgit-maint-debrebase.7.pod:165
msgid ""
"Because we want to work in git, we need a virtual upstream branch with "
"virtual release tags. gbp-import-orig(1) can manage this for us. To begin"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:200
+#: ../dgit-maint-debrebase.7.pod:226
msgid ""
"You are now ready to proceed as above, making commits to the I<debian/> "
"directory and to the upstream source. As above, for technical reasons, B<it "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:212
+#: ../dgit-maint-debrebase.7.pod:238
msgid ""
"If you have an existing git history that you have pushed to an ordinary git "
"server like B<salsa.debian.org>, we start with that. If you don't already "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:219
+#: ../dgit-maint-debrebase.7.pod:245
#, no-wrap
msgid ""
" % git clone salsa.debian.org:Debian/foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:226
+#: ../dgit-maint-debrebase.7.pod:252
msgid ""
"If you don't have any existing git history, or you have history only on the "
"special B<dgit-repos> server, we start with B<dgit clone>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:231
+#: ../dgit-maint-debrebase.7.pod:257
#, no-wrap
msgid ""
" % dgit clone foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:236
+#: ../dgit-maint-debrebase.7.pod:262
msgid "Then we make new upstream tags available:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:244
+#: ../dgit-maint-debrebase.7.pod:270
msgid ""
"We now use a B<git debrebase convert-from-*> command to convert your "
"existing history to the git-debrebase(5) data model. Which command you "
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:250
+#: ../dgit-maint-debrebase.7.pod:276
msgid "(A) There is no delta queue."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:252
+#: ../dgit-maint-debrebase.7.pod:278
msgid "If there do not exist any Debian patches, use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:256 ../dgit-maint-debrebase.7.pod:268
+#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294
#, no-wrap
msgid ""
" % git debrebase convert-from-gbp\n"
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:260
+#: ../dgit-maint-debrebase.7.pod:286
msgid "(B) There is a delta queue, and patches are unapplied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:262
+#: ../dgit-maint-debrebase.7.pod:288
msgid ""
"This is the standard git-buildpackage(1) workflow: there are Debian patches, "
"but the upstream source is committed to git without those patches applied. "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:272
+#: ../dgit-maint-debrebase.7.pod:298
msgid ""
"If you were not previously using dgit to upload your package (i.e. you were "
"not using the workflow described in dgit-maint-gbp(7)), and you happen to "
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:277
+#: ../dgit-maint-debrebase.7.pod:303
msgid "(C) There is a delta queue, and patches are applied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:279
+#: ../dgit-maint-debrebase.7.pod:305
msgid "Use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:283
+#: ../dgit-maint-debrebase.7.pod:309
#, no-wrap
msgid ""
" % git debrebase convert-from-dgit-view\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:289
+#: ../dgit-maint-debrebase.7.pod:315
msgid ""
"Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it "
"is exactly what you would get if you deleted .git, invoked B<dpkg-"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:300
+#: ../dgit-maint-debrebase.7.pod:326
msgid ""
"git-debrebase(1) does not yet support using B<git merge> to merge divergent "
"branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:307
+#: ../dgit-maint-debrebase.7.pod:333
#, no-wrap
msgid ""
" % git config --local pull.rebase true\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:311
+#: ../dgit-maint-debrebase.7.pod:337
msgid ""
"Now when you pull work from other Debian contributors, git will rebase your "
"work on top of theirs."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:314
+#: ../dgit-maint-debrebase.7.pod:340
msgid ""
"If you use this clone for upstream development in addition to Debian "
"packaging work, you may not want to set this global setting. Instead, see "
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:319
+#: ../dgit-maint-debrebase.7.pod:345
msgid "IMPORTING NEW UPSTREAM RELEASES"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:321
+#: ../dgit-maint-debrebase.7.pod:347
msgid ""
"There are two steps: obtaining git refs that correspond to the new release, "
"and importing that release using git-debrebase(1)."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:357
+#: ../dgit-maint-debrebase.7.pod:387
msgid "Importing the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:361
+#: ../dgit-maint-debrebase.7.pod:391
#, no-wrap
msgid ""
" % git debrebase new-upstream 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:365
+#: ../dgit-maint-debrebase.7.pod:395
msgid ""
"This invocation of git-debrebase(1) involves a git rebase. You may need to "
"resolve conflicts if the Debian delta queue does not apply cleanly to the "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:369
+#: ../dgit-maint-debrebase.7.pod:399
msgid ""
"If all went well, you can now review the merge of the new upstream release:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:374
+#: ../dgit-maint-debrebase.7.pod:404
#, no-wrap
msgid ""
" git diff debian/1.2.2-1..HEAD -- . ':!debian'\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:378
+#: ../dgit-maint-debrebase.7.pod:408
msgid ""
-"Pass I<--stat> just to see the list of changed files, which is useful to "
-"determine whether there are any new or deleted files that may need "
-"accounting for in your copyright file."
+"Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the "
+"list of added or removed files, which is useful to determine whether there "
+"are any new or deleted files that may need accounting for in your copyright "
+"file."
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:392
+#: ../dgit-maint-debrebase.7.pod:423
msgid "EDITING THE DEBIAN PACKAGING"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:394
+#: ../dgit-maint-debrebase.7.pod:425
msgid "Just make commits on master that change the contents of I<debian/>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:396
+#: ../dgit-maint-debrebase.7.pod:427
msgid "EDITING THE DELTA QUEUE"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:398
+#: ../dgit-maint-debrebase.7.pod:429
msgid "Adding new patches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:400
+#: ../dgit-maint-debrebase.7.pod:431
msgid ""
"Adding new patches is straightforward: just make commits touching only files "
"outside of the I<debian/> directory. You can also use tools like git-"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:404
+#: ../dgit-maint-debrebase.7.pod:435
msgid "Editing patches: starting a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:406
+#: ../dgit-maint-debrebase.7.pod:437
msgid ""
"git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, "
"re-order and delete patches. Run"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714
+#: ../dgit-maint-debrebase.7.pod:442 ../dgit-maint-debrebase.7.pod:745
#, no-wrap
msgid ""
" % git debrebase -i\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:415
+#: ../dgit-maint-debrebase.7.pod:446
msgid ""
"to start an interactive rebase. You can edit, re-order and delete commits "
"just as you would during B<git rebase -i>."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:418
+#: ../dgit-maint-debrebase.7.pod:449
msgid "Editing patches: finishing a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:420
+#: ../dgit-maint-debrebase.7.pod:451
msgid ""
"After completing the git rebase, your branch will not be a fast-forward of "
"the git HEAD you had before the rebase. This means that we cannot push the "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:426
+#: ../dgit-maint-debrebase.7.pod:457
msgid ""
"If you are not yet ready to upload, and want to push your branch to a git "
"remote such as B<salsa.debian.org>,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:431
+#: ../dgit-maint-debrebase.7.pod:462
#, no-wrap
msgid ""
" % git debrebase conclude\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:435
+#: ../dgit-maint-debrebase.7.pod:466
msgid ""
"Note that each time you conclude a debrebase you introduce a pseudomerge "
"into your git history, which may make it harder to read. Try to do all of "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:443
+#: ../dgit-maint-debrebase.7.pod:474
msgid ""
"You can use dpkg-buildpackage(1) for test builds. When you are ready to "
"build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:447
+#: ../dgit-maint-debrebase.7.pod:478
msgid ""
"Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> "
"if the package is new in the target suite."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:450
+#: ../dgit-maint-debrebase.7.pod:481
msgid ""
"In some cases where you used B<git debrebase convert-from-gbp> since the "
"last upload, it is not possible for dgit to make your history fast-"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:456
+#: ../dgit-maint-debrebase.7.pod:487
msgid ""
"Right before uploading, if you did not just already do so, you might want to "
"have git-debrebase(1) shuffle your branch such that the Debian delta queue "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:462
+#: ../dgit-maint-debrebase.7.pod:493
#, no-wrap
msgid ""
" % git debrebase\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:467
+#: ../dgit-maint-debrebase.7.pod:498
msgid "Note that this will introduce a new pseudomerge."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:469
+#: ../dgit-maint-debrebase.7.pod:500
msgid ""
"After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're "
"using that."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:474
+#: ../dgit-maint-debrebase.7.pod:505
msgid "Illegal material"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:476
+#: ../dgit-maint-debrebase.7.pod:507
msgid ""
"Here we explain how to handle material that is merely DFSG-non-free. "
"Material which is legally dangerous (for example, files which are actually "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:480
+#: ../dgit-maint-debrebase.7.pod:511
#, no-wrap
msgid ""
"If you encounter possibly-legally-dangerous material in the upstream\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:486
+#: ../dgit-maint-debrebase.7.pod:517
msgid "DFSG-non-free: When upstream tags releases in git"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:488
+#: ../dgit-maint-debrebase.7.pod:519
msgid ""
"Our approach is to maintain a DFSG-clean upstream branch, and create tags on "
"this branch for each release that we want to import. We then import those "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:494
+#: ../dgit-maint-debrebase.7.pod:525
msgid "For the first upstream release that requires DFSG filtering:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:498
+#: ../dgit-maint-debrebase.7.pod:529
#, no-wrap
msgid ""
" % git checkout -b upstream-dfsg 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:506
+#: ../dgit-maint-debrebase.7.pod:537
msgid ""
"Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or "
"in the case of a new package,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:511
+#: ../dgit-maint-debrebase.7.pod:542
#, no-wrap
msgid ""
" % git branch --unset-upstream\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:516
+#: ../dgit-maint-debrebase.7.pod:547
msgid "and proceed with \"INITIAL DEBIANISATION\"."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:518
+#: ../dgit-maint-debrebase.7.pod:549
msgid ""
"For subsequent releases (whether or not they require additional filtering):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:523
+#: ../dgit-maint-debrebase.7.pod:554
#, no-wrap
msgid ""
" % git checkout upstream-dfsg\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:533
+#: ../dgit-maint-debrebase.7.pod:564
msgid ""
"Our upstream-dfsg branch cannot be pushed to B<dgit-repos>, but since we "
"will need it whenever we import a new upstream version, we must push it "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:540
+#: ../dgit-maint-debrebase.7.pod:571
#, no-wrap
msgid ""
" % git push --follow-tags -u origin master upstream-dfsg\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:544
+#: ../dgit-maint-debrebase.7.pod:575
msgid "DFSG-non-free: When upstream releases only tarballs"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:553
+#: ../dgit-maint-debrebase.7.pod:584
msgid "In the simplest case,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:557
+#: ../dgit-maint-debrebase.7.pod:588
#, no-wrap
msgid ""
" % dgit fetch\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:562
+#: ../dgit-maint-debrebase.7.pod:593
msgid ""
"If that fails, because your branch and the NMUers' work represent divergent "
"branches of development, you have a number of options. Here we describe the "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:566
+#: ../dgit-maint-debrebase.7.pod:597
msgid ""
"Note that you should not try to resolve the divergent branches by editing "
"files in I<debian/patches>. Changes there would either cause trouble, or be "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:570
+#: ../dgit-maint-debrebase.7.pod:601
msgid "Rebasing your work onto the NMU"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:574
+#: ../dgit-maint-debrebase.7.pod:605
#, no-wrap
msgid ""
" % git rebase dgit/dgit/sid\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:578
+#: ../dgit-maint-debrebase.7.pod:609
msgid ""
"If the NMUer added new commits modifying the upstream source, you will "
"probably want to debrebase before your next upload to tidy those up."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:581
+#: ../dgit-maint-debrebase.7.pod:612
msgid ""
"For example, the NMUer might have used git-revert(1) to unapply one of your "
"patches. A debrebase can be used to strip both the patch and the reversion "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:585
+#: ../dgit-maint-debrebase.7.pod:616
msgid "Manually applying the debdiff"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:587
+#: ../dgit-maint-debrebase.7.pod:618
msgid ""
"If you cannot rebase because you have already pushed to B<salsa.debian.org>, "
"say, you can manually apply the NMU debdiff, commit and debrebase. The next "
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:592
+#: ../dgit-maint-debrebase.7.pod:623
msgid "HINTS AND TIPS"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:594
+#: ../dgit-maint-debrebase.7.pod:625
msgid "Minimising pseudomerges"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:596
+#: ../dgit-maint-debrebase.7.pod:627
msgid ""
"Above we noted that each time you conclude a debrebase, you introduce a "
"pseudomerge into your git history, which may make it harder to read."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:599
+#: ../dgit-maint-debrebase.7.pod:630
msgid ""
"A simple convention you can use to minimise the number of pseudomerges is to "
"B<git debrebase conclude> only right before you upload or push to B<salsa."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:603
+#: ../dgit-maint-debrebase.7.pod:634
msgid ""
"It is possible, though much less convenient, to reduce the number of "
"pseudomerges yet further. We debrebase only (i) when importing a new "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:611
+#: ../dgit-maint-debrebase.7.pod:642
msgid "The debian/patches directory"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:613
+#: ../dgit-maint-debrebase.7.pod:644
msgid ""
"In this workflow, I<debian/patches> is purely an output of git-"
"debrebase(1). You should not make changes there. They will either cause "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:618
+#: ../dgit-maint-debrebase.7.pod:649
msgid ""
"I<debian/patches> will often be out-of-date because git-debrebase(1) will "
"only regenerate it when it needs to. So you should not rely on the "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:624
+#: ../dgit-maint-debrebase.7.pod:655
msgid "Upstream branches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:626
+#: ../dgit-maint-debrebase.7.pod:657
msgid "In this workflow, we specify upstream tags rather than any branches."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:628
+#: ../dgit-maint-debrebase.7.pod:659
msgid ""
"Except when (i) upstream releases only tarballs, (ii) we require DFSG "
"filtering, or (iii) you also happen to be involved in upstream development, "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:634
+#: ../dgit-maint-debrebase.7.pod:665
msgid ""
"The idea here is that from Debian's point of view, upstream releases are "
"immutable points in history. We want to make sure that we are basing our "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:640
+#: ../dgit-maint-debrebase.7.pod:671
msgid ""
"Upstream's branches remain available as the git remote tracking branches for "
"your upstream remote, e.g. I<remotes/upstream/master>."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:643
+#: ../dgit-maint-debrebase.7.pod:674
msgid "The first ever dgit push"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:645
+#: ../dgit-maint-debrebase.7.pod:676
msgid ""
"If this is the first ever dgit push of the package, consider passing I<--"
"deliberately-not-fast-forward> instead of I<--overwrite>. This avoids "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:651
+#: ../dgit-maint-debrebase.7.pod:682
msgid "Inspecting the history"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:653
+#: ../dgit-maint-debrebase.7.pod:684
msgid ""
"The git history made by git-debrebase can seem complicated. Here are some "
"suggestions for helpful invocations of gitk and git. They can be adapted "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:657
+#: ../dgit-maint-debrebase.7.pod:688
msgid "History of package in Debian, disregarding history from upstream:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:661
+#: ../dgit-maint-debrebase.7.pod:692
#, no-wrap
msgid ""
" % gitk --first-parent\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:663
+#: ../dgit-maint-debrebase.7.pod:694
msgid "In a laundered branch, the delta queue is at the top."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:667
+#: ../dgit-maint-debrebase.7.pod:698
msgid "History of the packaging, excluding the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:669
+#: ../dgit-maint-debrebase.7.pod:700
#, no-wrap
msgid ""
" % gitk :/debian :!/debian/patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:671
+#: ../dgit-maint-debrebase.7.pod:702
msgid "Just the delta queue (i.e. Debian's changes to upstream):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:673
+#: ../dgit-maint-debrebase.7.pod:704
#, no-wrap
msgid ""
" % gitk --first-parent -- :/ :!/debian\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:675
+#: ../dgit-maint-debrebase.7.pod:706
msgid "Full history including old versions of the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:679
+#: ../dgit-maint-debrebase.7.pod:710
#, no-wrap
msgid ""
" % gitk --date-order\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:681
+#: ../dgit-maint-debrebase.7.pod:712
msgid ""
"The \"Declare fast forward\" commits you see have an older history (usually, "
"an older delta queue) as one parent, and a newer history as the other. --"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:688
+#: ../dgit-maint-debrebase.7.pod:719
msgid "Complete diff since the last upload:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:692
+#: ../dgit-maint-debrebase.7.pod:723
#, no-wrap
msgid ""
" % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:694
+#: ../dgit-maint-debrebase.7.pod:725
msgid "This includes changes to upstream files."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:698
+#: ../dgit-maint-debrebase.7.pod:729
msgid "Interdiff of delta queue since last upload, if you really want it:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:700
+#: ../dgit-maint-debrebase.7.pod:731
#, no-wrap
msgid ""
" % git debrebase make-patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:703
+#: ../dgit-maint-debrebase.7.pod:734
msgid "And of course there is:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:705
+#: ../dgit-maint-debrebase.7.pod:736
#, no-wrap
msgid ""
" % git debrebase status\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:707
+#: ../dgit-maint-debrebase.7.pod:738
msgid "Alternative ways to start a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:709
+#: ../dgit-maint-debrebase.7.pod:740
msgid ""
"Above we started an interactive debrebase by invoking git-debrebase(1) like "
"this:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:718
+#: ../dgit-maint-debrebase.7.pod:749
msgid "It is also possible to perform a non-interactive rebase, like this:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:722
+#: ../dgit-maint-debrebase.7.pod:753
#, no-wrap
msgid ""
" % git debrebase -- [git-rebase options...]\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:727
+#: ../dgit-maint-debrebase.7.pod:758
msgid ""
"A third alternative is to have git-debrebase(1) shuffle all the Debian "
"changes to the end of your branch, and then manipulate them yourself using "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:733
+#: ../dgit-maint-debrebase.7.pod:764
#, no-wrap
msgid ""
" % git debrebase\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:738
+#: ../dgit-maint-debrebase.7.pod:769
msgid ""
"If you take this approach, you should be very careful not to start the "
"rebase too early, including before the most recent pseudomerge. git-rebase "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:749
+#: ../dgit-maint-debrebase.7.pod:780
msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =item
-#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446
+#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476
#, no-wrap
msgid "1."
msgstr ""
#. type: =item
-#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450
+#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480
#, no-wrap
msgid "2."
msgstr ""
#. type: =item
-#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455
+#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485
#, no-wrap
msgid "3."
msgstr ""
#. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
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
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
#. type: textblock
#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128
-#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138
+#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138
msgid "dgit(1), dgit(7)"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484
+#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:514
#, no-wrap
msgid ""
" % dgit pull\n"
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335
-#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67
-#: ../dgit-maint-debrebase.7.pod:321
+#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
+#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
+#: ../dgit-maint-debrebase.7.pod:352
msgid "When upstream tags releases in git"
msgstr ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402
-#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383
+#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
+#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
#, no-wrap
msgid ""
" % git deborig\n"
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343
-#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137
-#: ../dgit-maint-debrebase.7.pod:329
+#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137
+msgid "Using untagged upstream commits"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141
+msgid ""
+"Sometimes upstream does not tag their releases, or you want to package an "
+"unreleased git snapshot. In such a case you can create your own upstream "
+"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream "
+"version you plan to put in I<debian/changelog>. The B<upstream/> prefix "
+"ensures that your tag will not clash with any tags upstream later creates."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148
+msgid ""
+"For example, suppose that the latest upstream release is 1.2.2 and you want "
+"to package git commit ab34c21 which was made on 2013-12-11. A common "
+"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 "
+"and so you could use"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155
+#, no-wrap
+msgid ""
+" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159
+msgid "to obtain a release tag, and then proceed as above."
+msgstr ""
+
+#. type: =head3
+#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
+#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
+#: ../dgit-maint-debrebase.7.pod:364
msgid "When upstream releases only tarballs"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:125
+#: ../dgit-maint-merge.7.pod:151
msgid ""
"We need a virtual upstream branch with virtual release tags. gbp-import-"
"orig(1) can manage this for us. To begin"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145
+#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
#, no-wrap
msgid ""
" % mkdir foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151
+#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
msgid "Now create I<debian/gbp.conf>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155
+#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
#, no-wrap
msgid ""
" [DEFAULT]\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160
+#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
#, no-wrap
msgid ""
" sign-tags = True\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164
+#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
#, no-wrap
msgid ""
" [import-orig]\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169
+#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173
+#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
#, no-wrap
msgid ""
" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
+#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
msgid "Then we can import the upstream version:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185
+#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
#, no-wrap
msgid ""
" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189
+#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
msgid ""
"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
"need it whenever we import a new upstream version, we must push it "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
+#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
#, no-wrap
msgid ""
" % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:185
+#: ../dgit-maint-merge.7.pod:211
msgid ""
"You are now ready to proceed as above, making commits to both the upstream "
"source and the I<debian/> directory."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207
+#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
msgid "CONVERTING AN EXISTING PACKAGE"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209
+#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
msgid ""
"This section explains how to convert an existing Debian package to this "
"workflow. It should be skipped when debianising a new package."
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:193
+#: ../dgit-maint-merge.7.pod:219
msgid "No existing git history"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:197
+#: ../dgit-maint-merge.7.pod:223
#, no-wrap
msgid ""
" % dgit clone foo\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:203
+#: ../dgit-maint-merge.7.pod:229
msgid "Existing git history using another workflow"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:205
+#: ../dgit-maint-merge.7.pod:231
msgid ""
"First, if you don't already have the git history locally, clone it, and "
"obtain the corresponding orig.tar from the archive:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:210
+#: ../dgit-maint-merge.7.pod:236
#, no-wrap
msgid ""
" % git clone git.debian.org:collab-maint/foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:216
+#: ../dgit-maint-merge.7.pod:242
msgid "Now dump any existing patch queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:220
+#: ../dgit-maint-merge.7.pod:246
#, no-wrap
msgid ""
" % git rm -rf debian/patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:225
+#: ../dgit-maint-merge.7.pod:251
msgid "Then make new upstream tags available:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240
+#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
#, no-wrap
msgid ""
" % git remote add -f upstream https://some.upstream/foo.git\n"
msgstr ""
#. type: =for
-#: ../dgit-maint-merge.7.pod:233
+#: ../dgit-maint-merge.7.pod:259
msgid "dgit-test dpkg-source-ignores begin"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:235
+#: ../dgit-maint-merge.7.pod:261
msgid ""
"Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., "
"it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\."
msgstr ""
#. type: =for
-#: ../dgit-maint-merge.7.pod:240
+#: ../dgit-maint-merge.7.pod:266
msgid "dgit-test dpkg-source-ignores end"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289
+#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
msgid ""
"To achieve this, you might need to delete I<debian/source/local-options>. "
"One way to have dgit check your progress is to run B<dgit build-source>."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:246
+#: ../dgit-maint-merge.7.pod:272
msgid ""
"The first dgit push will require I<--overwrite>. If this is the first ever "
"dgit push of the package, consider passing I<--deliberately-not-fast-"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:253
+#: ../dgit-maint-merge.7.pod:279
msgid "SOURCE PACKAGE CONFIGURATION"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:255
+#: ../dgit-maint-merge.7.pod:281
msgid "debian/source/options"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:257
+#: ../dgit-maint-merge.7.pod:283
msgid ""
"We set some source package options such that dgit can transparently handle "
"the \"dropping\" and \"refreshing\" of changes to the upstream source:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:263
+#: ../dgit-maint-merge.7.pod:289
#, no-wrap
msgid ""
" single-debian-patch\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:268
+#: ../dgit-maint-merge.7.pod:294
msgid ""
"You don't need to create this file if you are using the version 1.0 source "
"package format."
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:271
+#: ../dgit-maint-merge.7.pod:297
msgid "Sample text for debian/source/patch-header"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:273
+#: ../dgit-maint-merge.7.pod:299
msgid ""
"It is a good idea to explain how a user can obtain a breakdown of the "
"changes to the upstream source:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:278
+#: ../dgit-maint-merge.7.pod:304
msgid ""
"The Debian packaging of foo is maintained in git, using the merging workflow "
"described in dgit-maint-merge(7). There isn't a patch queue that can be "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:282
+#: ../dgit-maint-merge.7.pod:308
msgid ""
"A detailed breakdown of the changes is available from their canonical "
"representation - git commits in the packaging repository. For example, to "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:290
+#: ../dgit-maint-merge.7.pod:316
#, no-wrap
msgid ""
" % git clone https://git.dgit.debian.org/foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:296
+#: ../dgit-maint-merge.7.pod:322
msgid ""
"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:299
+#: ../dgit-maint-merge.7.pod:325
msgid "A single combined diff, containing all the changes, follows."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:303
+#: ../dgit-maint-merge.7.pod:329
msgid ""
"If you are using the version 1.0 source package format, this text should be "
"added to README.source instead. The version 1.0 source package format "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:307
+#: ../dgit-maint-merge.7.pod:333
msgid ""
"If you're using the version 3.0 (quilt) source package format, you could add "
"this text to README.source instead of debian/source/patch-header, but this "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436
+#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
msgid "BUILDING AND UPLOADING"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:314
+#: ../dgit-maint-merge.7.pod:340
msgid ""
"Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, "
"B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:320
+#: ../dgit-maint-merge.7.pod:346
msgid ""
"As an alternative to B<dgit build> and friends, you can use a tool like "
"gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:327
+#: ../dgit-maint-merge.7.pod:353
msgid ""
"If you want to skip dgit's checks while iterating on a problem with the "
"package build (for example, you don't want to commit your changes to git), "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:331
+#: ../dgit-maint-merge.7.pod:357
msgid "NEW UPSTREAM RELEASES"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319
+#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
msgid "Obtaining the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325
+#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
" % git remote update\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331
+#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
+msgid ""
+"If you want to package an untagged upstream commit (because upstream does "
+"not tag releases or because you want to package an upstream development "
+"snapshot), see \"Using untagged upstream commits\" above."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
msgid ""
"You will need the I<debian/gbp.conf> from \"When upstream releases only "
"tarballs\", above. You will also need your upstream branch. Above, we "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336
+#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
msgid "Then, either"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340
+#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
#, no-wrap
msgid ""
" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344
+#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
msgid "or if you have a working watch file"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348
+#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
#, no-wrap
msgid ""
" % gbp import-orig --no-merge --uscan\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:366
+#: ../dgit-maint-merge.7.pod:396
msgid "Reviewing & merging the release"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:368
+#: ../dgit-maint-merge.7.pod:398
msgid ""
"It's a good idea to preview the merge of the new upstream release. First, "
"just check for any new or deleted files that may need accounting for in your "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:374
+#: ../dgit-maint-merge.7.pod:404
#, no-wrap
msgid ""
-" % git diff --stat master..1.2.3 -- . ':!debian'\n"
+" % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n"
"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:378
+#: ../dgit-maint-merge.7.pod:408
msgid "You can then review the full merge diff:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:382
+#: ../dgit-maint-merge.7.pod:412
#, no-wrap
msgid ""
" % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:386
+#: ../dgit-maint-merge.7.pod:416
msgid "Once you're satisfied with what will be merged, update your package:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:390
+#: ../dgit-maint-merge.7.pod:420
#, no-wrap
msgid ""
" % git merge 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377
+#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
msgid ""
"If you obtained a tarball from upstream, you are ready to try a build. If "
"you merged a git tag from upstream, you will first need to generate a "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461
+#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
msgid "HANDLING DFSG-NON-FREE MATERIAL"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:410
+#: ../dgit-maint-merge.7.pod:440
msgid "We create a DFSG-clean tag to merge to master:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:414
+#: ../dgit-maint-merge.7.pod:444
#, no-wrap
msgid ""
" % git checkout -b pre-dfsg 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:423
+#: ../dgit-maint-merge.7.pod:453
msgid ""
"Before merging the new 1.2.3+dfsg tag to master, you should first determine "
"whether it would be legally dangerous for the non-free material to be "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:428
+#: ../dgit-maint-merge.7.pod:458
msgid ""
"If it would be dangerous, there is a big problem; in this case please "
"consult your archive administrators (for Debian this is the dgit "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521
+#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
msgid ""
"The easiest way to handle this is to add a B<Files-Excluded> field to "
"I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:440
+#: ../dgit-maint-merge.7.pod:470
msgid "FORWARDING PATCHES UPSTREAM"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:442
+#: ../dgit-maint-merge.7.pod:472
msgid "The basic steps are:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:448
+#: ../dgit-maint-merge.7.pod:478
msgid "Create a new branch based off upstream's master branch."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:452
+#: ../dgit-maint-merge.7.pod:482
msgid ""
"git-cherry-pick(1) commits from your master branch onto your new branch."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:457
+#: ../dgit-maint-merge.7.pod:487
msgid ""
"Push the branch somewhere and ask upstream to merge it, or use git-format-"
"patch(1) or git-request-pull(1)."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:462
+#: ../dgit-maint-merge.7.pod:492
msgid "For example (and it is only an example):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:466
+#: ../dgit-maint-merge.7.pod:496
#, no-wrap
msgid ""
" % # fork foo.git on GitHub\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:476
+#: ../dgit-maint-merge.7.pod:506
msgid ""
"Note that when you merge an upstream release containing your forwarded "
"patches, git and dgit will transparently handle \"dropping\" the patches "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130
-#: ../dgit-maint-debrebase.7.pod:526
+#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
+#: ../dgit-maint-debrebase.7.pod:582
msgid "INCORPORATING NMUS"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:488
+#: ../dgit-maint-merge.7.pod:518
msgid ""
"Alternatively, you can apply the NMU diff to your repository. The next push "
"will then require I<--overwrite>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140
-#: ../dgit-maint-debrebase.7.pod:726
+#: ../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:228
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728
+#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>. It contains contributions from other dgit "
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
msgid "dgit - git integration with the Debian archive"
msgstr ""
-#. type: SH
-#: ../dgit.1:6
+#. type: =head1
+#: ../dgit.1:6 ../git-debpush.1.pod:5
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
msgid "B<dgit> [I<dgit-opts>] I<action> ..."
msgstr ""
-#. type: SH
-#: ../dgit.1:33
+#. type: =head1
+#: ../dgit.1:33 ../git-debpush.1.pod:9
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:185 ../dgit.1:1192
+#: ../dgit.1:185 ../dgit.1:1269
msgid "Print a usage summary."
msgstr ""
msgstr ""
#. type: =item
-#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446
+#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476
#, no-wrap
msgid "1."
msgstr ""
msgstr ""
#. type: =item
-#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450
+#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480
#, no-wrap
msgid "2."
msgstr ""
msgstr ""
#. type: =item
-#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455
+#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485
#, no-wrap
msgid "3."
msgstr ""
"won't make broken pushes.)"
msgstr ""
+#. type: Plain text
+#: ../dgit.1:657
+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 "
+"still be deleted, especially with --clean=git. If you want to include "
+"untracked files in the build, you can use --clean=none or --clean=dpkg-"
+"source[-d] in addition to --include-dirty. Note that this combination can "
+"fail if the untracked files are under I<debian/patches/>."
+msgstr ""
+
#. type: TP
-#: ../dgit.1:645
+#: ../dgit.1:657
#, no-wrap
msgid "B<--ignore-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:648
+#: ../dgit.1:660
msgid "Deprecated alias for --include-dirty."
msgstr ""
#. type: TP
-#: ../dgit.1:648
+#: ../dgit.1:660
#, no-wrap
msgid "B<--overwrite>[=I<previous-version>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:659
+#: ../dgit.1:671
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-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:666
+#: ../dgit.1:678
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:670
+#: ../dgit.1:682
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:676
+#: ../dgit.1:688
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:690
+#: ../dgit.1:702
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:696
+#: ../dgit.1:708
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:701
+#: ../dgit.1:713
msgid ""
-"(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the "
-"dgit view and the maintainer view, the pseudo-merge will appear only in the "
-"dgit view.)"
+"(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 "
+"appear only in the dgit view.)"
msgstr ""
#. type: TP
-#: ../dgit.1:701
+#: ../dgit.1:713
#, no-wrap
msgid "B<--delayed>=I<days>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:704
+#: ../dgit.1:716
msgid "Upload to a DELAYED queue."
msgstr ""
#. type: Plain text
-#: ../dgit.1:714
+#: ../dgit.1:726
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:719
+#: ../dgit.1:731
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:719
+#: ../dgit.1:731
#, no-wrap
msgid "B<--no-chase-dsc-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:725
+#: ../dgit.1:737
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:735
+#: ../dgit.1:747
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:743
+#: ../dgit.1:755
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:743
+#: ../dgit.1:755
#, no-wrap
msgid "B<--save-dgit-view=>I<branch>|I<ref>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:753
+#: ../dgit.1:765
msgid ""
-"Specifies that when a split view quilt mode is in operation, and dgit "
-"calculates (or looks up in its cache) a dgit view corresponding to your "
-"HEAD, the dgit view will be left in I<ref>. The specified ref is "
-"unconditionally overwritten, so don't specify a branch you want to keep."
+"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 "
+"view will be left in I<ref>. The specified ref is unconditionally "
+"overwritten, so don't specify a branch you want to keep."
msgstr ""
#. type: Plain text
-#: ../dgit.1:760
+#: ../dgit.1:769
msgid ""
"This option is effective only with the following operations: quilt-fixup; "
-"push; all builds. And it is only effective with --[quilt=]gbp, --"
-"[quilt=]dpm, --quilt=unpatched."
+"push; all builds. And it is only effective when split view is actually in "
+"operation."
msgstr ""
#. type: Plain text
-#: ../dgit.1:764
+#: ../dgit.1:773
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:768
+#: ../dgit.1:777
msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
msgstr ""
#. type: TP
-#: ../dgit.1:768
+#: ../dgit.1:777
#, no-wrap
msgid "B<--deliberately->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:782
+#: ../dgit.1:791
msgid ""
"Declare that you are deliberately doing I<something>. This can be used to "
"override safety catches, including safety catches which relate to distro-"
msgstr ""
#. type: TP
-#: ../dgit.1:782
+#: ../dgit.1:791
#, no-wrap
msgid "B<--deliberately-not-fast-forward>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:788
+#: ../dgit.1:797
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:799
+#: ../dgit.1:808
msgid ""
-"In split view quilt modes, this also prevents the construction by dgit of a "
-"pseudomerge to make the dgit view fast forwarding. Normally only one of --"
-"overwrite (which creates a suitable pseudomerge) and --deliberately-not-"
-"fast-forward (which suppresses the pseudomerge and the fast forward checks) "
-"should be needed; --overwrite is usually better."
+"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 "
+"of --overwrite (which creates a suitable pseudomerge) and --deliberately-"
+"not-fast-forward (which suppresses the pseudomerge and the fast forward "
+"checks) should be needed; --overwrite is usually better."
msgstr ""
#. type: TP
-#: ../dgit.1:799
+#: ../dgit.1:808
#, no-wrap
msgid "B<--deliberately-include-questionable-history>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:808
+#: ../dgit.1:817
msgid ""
"Declare that you are deliberately including, in the git history of your "
"current push, history which contains a previously-submitted version of this "
msgstr ""
#. type: TP
-#: ../dgit.1:808
+#: ../dgit.1:817
#, no-wrap
msgid "B<--deliberately-fresh-repo>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:813
+#: ../dgit.1:822
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 "
"server will do this automatically when necessary."
msgstr ""
-#. type: TP
-#: ../dgit.1:813
+#. type: =item
+#: ../dgit.1:822 ../git-debpush.1.pod:112
#, no-wrap
msgid "B<--quilt=linear>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:820
+#: ../dgit.1:829
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:825
+#: ../dgit.1:834
msgid ""
"HEAD should be a series of plain commits (not touching debian/patches/), and "
"pseudomerges, with as ancestor a patches-applied branch."
msgstr ""
-#. type: TP
-#: ../dgit.1:825
+#. type: =item
+#: ../dgit.1:834 ../git-debpush.1.pod:124
#, no-wrap
msgid "B<--quilt=auto>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:834
+#: ../dgit.1:843
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a "
-"linear patch stack (as with --quilt=auto) but if that doesn't seem "
+"linear patch stack (as with --quilt=linear) but if that doesn't seem "
"possible, try to generate a single squashed patch for all the changes made "
"in git (as with --quilt=smash). This is not a good idea for an NMU in "
"Debian."
msgstr ""
-#. type: TP
-#: ../dgit.1:834
+#. type: =item
+#: ../dgit.1:843 ../git-debpush.1.pod:118
#, no-wrap
msgid "B<--quilt=smash>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:839
+#: ../dgit.1:848
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:845
+#: ../dgit.1:854
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 "
"remain true.)"
msgstr ""
-#. type: TP
-#: ../dgit.1:845
+#. type: =item
+#: ../dgit.1:854 ../git-debpush.1.pod:129
#, no-wrap
msgid "B<--quilt=nofix>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:853
+#: ../dgit.1:862
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:853
+#: ../dgit.1:862
#, no-wrap
msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:858
+#: ../dgit.1:867
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:858
+#: ../dgit.1:867
#, no-wrap
-msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>"
+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:865
+#: ../dgit.1:874
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:873
+#: ../dgit.1:878
+msgid ""
+"These quilt modes are known as B<splitting quilt modes>. See --split-view, "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:886
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:881
+#: ../dgit.1:894
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:886
+#: ../dgit.1:899
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:904
+#: ../dgit.1:913
msgid ""
-"With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup "
-"and build) will automatically generate a conversion of your git branch into "
-"the right form. dgit push will push the dgit-compatible form (the B<dgit "
-"view>) to the dgit git server. The dgit view will be visible to you in the "
-"dgit remote tracking branches, but your own branch will not be modified. "
-"dgit push will create a tag B<debian/>I<version> for the maintainer view, "
-"and the dgit tag B<archive/debian/>I<version> for the dgit view. dgit quilt-"
-"fixup will merely do some checks, and cache the maintainer view."
+"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies "
+"that your HEAD contains only a debian/ directory, with any changes to "
+"upstream files represented as patches in debian/patches. The upstream "
+"source must be available in git, by default, in a suitably named git tag; "
+"see --upstream-commitish. In this mode, dgit cannot check that all edited "
+"upstream files are properly represented as patches: dgit relies on debian/"
+"patches being correct."
msgstr ""
#. type: Plain text
-#: ../dgit.1:913
+#: ../dgit.1:924
+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, "
+"dgit will import your orig tarballs' contents into git. In this mode, dgit "
+"cannot check that the upstream parts of your upload correspond to what you "
+"intend: dgit relies on the right orig tarball(s) existing, and debian/"
+"patches being correct."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:942
+msgid ""
+"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like "
+"quilt-fixup and build) will automatically generate a conversion of your git "
+"branch into the right form. dgit push will push the dgit-compatible form "
+"(the B<dgit view>) to the dgit git server. The dgit view will be visible "
+"to you in the dgit remote tracking branches, but your own branch will not be "
+"modified. dgit push will create a tag B<debian/>I<version> for the "
+"maintainer view, and the dgit tag B<archive/debian/>I<version> for the dgit "
+"view. dgit quilt-fixup will merely do some checks, and cache the maintainer "
+"view."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:951
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:913
+#: ../dgit.1:951
#, no-wrap
msgid "B<-d>I<distro> | B<--distro=>I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:922
+#: ../dgit.1:960
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-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:928
+#: ../dgit.1:966
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:933
+#: ../dgit.1:971
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:933
+#: ../dgit.1:971
+#, no-wrap
+msgid "B<--split-view=auto>|B<always>|B<never>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:976
+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:984
+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 "
+"pseudomerges, which bring into the git history previous uploads made with "
+"dgit push, and any commits in debian/patches required to make a correct `3.0 "
+"(quilt)' source package."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:990
+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: "
+"--[quilt=]gbp, dpm, unpatched or baredebian*."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:993
+msgid ""
+"B<always> splits the view regardless of the source format and the quilt mode."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:996
+msgid "B<never> will cause dgit to fail if split view is needed."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1004
+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/"
+">I<suite> and B<archive/>I<distro>B</>I<version>."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1007
+msgid ""
+"Note that split view does not affect dgit fetch, and is not compatible with "
+"dgit pull."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1007
#, no-wrap
msgid "B<-C>I<changesfile>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:938
+#: ../dgit.1:1012
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:947
+#: ../dgit.1:1021
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:947
+#: ../dgit.1:1021
+#, no-wrap
+msgid "B<--upstream-commitish=>I<upstream>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1029
+msgid ""
+"For use with --quilt=baredebian only. Specifies the commit containing the "
+"upstream source. This commit must be identical to your .orig tarball. The "
+"default is to look for one of the git tags I<U>B< v>I<U>B< upstream/>I<U> "
+"(in that order), where U is the upstream version."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1029
#, no-wrap
msgid "B<--rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:959
+#: ../dgit.1:1041
msgid ""
"When doing a build, delete any changes files matching "
"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that "
msgstr ""
#. type: Plain text
-#: ../dgit.1:962
+#: ../dgit.1:1044
msgid ""
"Note that B<dgit push-source> will always find the right .changes, "
"regardless of this option."
msgstr ""
#. type: TP
-#: ../dgit.1:962
+#: ../dgit.1:1044
#, no-wrap
msgid "B<--build-products-dir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:966
+#: ../dgit.1:1048
msgid ""
"Specifies where to find and create tarballs, binary packages, source "
"packages, .changes files, and so on."
msgstr ""
#. type: Plain text
-#: ../dgit.1:969
+#: ../dgit.1:1051
msgid "By default, dgit uses the parent directory (B<..>)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:978
+#: ../dgit.1:1060
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-"
msgstr ""
#. type: TP
-#: ../dgit.1:978
+#: ../dgit.1:1060
#, no-wrap
msgid "B<--no-rm-on-error>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:981
+#: ../dgit.1:1063
msgid "Do not delete the destination directory if clone fails."
msgstr ""
#. type: TP
-#: ../dgit.1:981
+#: ../dgit.1:1063
#, no-wrap
msgid "B<--dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:988
+#: ../dgit.1:1070
msgid ""
"Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg "
-"B<archive/debian/>I<version>) where possible. This is the default."
+"B<archive/debian/>I<version>). This is the default."
msgstr ""
#. type: TP
-#: ../dgit.1:988
+#: ../dgit.1:1070
#, no-wrap
msgid "B<--no-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:994
-msgid ""
-"Do not generate a DEP-14 tag, except in split quilt view mode. (On servers "
-"where only the old tag format is supported, the dgit tag will have the "
-"DEP-14 name. This option does not prevent that.)"
+#: ../dgit.1:1073
+msgid "Do not generate a DEP-14 tag, except when split view is in operation."
msgstr ""
#. type: TP
-#: ../dgit.1:994
+#: ../dgit.1:1073
#, no-wrap
-msgid "B<--dep14tag-always>"
+msgid "B<--always-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:999
-msgid ""
-"Insist on generating a DEP-14 tag as well as a dgit tag. If the server does "
-"not support that, dgit push will fail."
+#: ../dgit.1:1076
+msgid "Obsolete alias for --dep14tag, retained for compatibility."
msgstr ""
#. type: TP
-#: ../dgit.1:999
+#: ../dgit.1:1076
#, no-wrap
msgid "B<-D>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1003
+#: ../dgit.1:1080
msgid ""
"Prints debugging information to stderr. Repeating the option produces more "
"output (currently, up to -DDDD is meaningfully different)."
msgstr ""
#. type: TP
-#: ../dgit.1:1003
+#: ../dgit.1:1080
#, no-wrap
msgid "B<-c>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1007
+#: ../dgit.1:1084
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:1007
+#: ../dgit.1:1084
#, no-wrap
msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1016
+#: ../dgit.1:1093
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1022
+#: ../dgit.1:1099
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1022
+#: ../dgit.1:1099
#, no-wrap
msgid "B<-m>I<maintaineraddress>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1025
+#: ../dgit.1:1102
msgid "Passed to dpkg-genchanges (eventually)."
msgstr ""
#. type: TP
-#: ../dgit.1:1025
+#: ../dgit.1:1102
#, no-wrap
msgid "B<--ch:>I<option>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1029
+#: ../dgit.1:1106
msgid ""
"Specifies a single additional option to pass, eventually, to dpkg-genchanges."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1036
+#: ../dgit.1:1113
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1038
+#: ../dgit.1:1115
msgid "For other options the caveat below applies."
msgstr ""
#. type: TP
-#: ../dgit.1:1038
+#: ../dgit.1:1115
#, no-wrap
msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1060
+#: ../dgit.1:1137
msgid ""
"Specifies a single additional option to pass to B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1068
+#: ../dgit.1:1145
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, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1073
+#: ../dgit.1:1150
msgid ""
"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
"applies only when the program is invoked directly by dgit. Usually, for "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1077
+#: ../dgit.1:1154
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1079
+#: ../dgit.1:1156
msgid "See notes below regarding ssh and dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1087
+#: ../dgit.1:1164
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:1087
+#: ../dgit.1:1164
#, no-wrap
msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1093
+#: ../dgit.1:1170
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:1098
+#: ../dgit.1:1175
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:1105
+#: ../dgit.1:1182
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1105
+#: ../dgit.1:1182
#, no-wrap
msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1128
+#: ../dgit.1:1205
msgid ""
"Specifies alternative programs to use instead of B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1136
+#: ../dgit.1:1213
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:1143
+#: ../dgit.1:1220
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1154
+#: ../dgit.1:1231
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1162
+#: ../dgit.1:1239
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1179
+#: ../dgit.1:1256
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1179
+#: ../dgit.1:1256
#, no-wrap
msgid "B<--existing-package=>I<package>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1189
+#: ../dgit.1:1266
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1189
+#: ../dgit.1:1266
#, no-wrap
msgid "B<-h>|B<--help>"
msgstr ""
#. type: TP
-#: ../dgit.1:1192
+#: ../dgit.1:1269
#, no-wrap
msgid "B<--initiator-tempdir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1201
+#: ../dgit.1:1278
msgid ""
"dgit rpush uses a temporary directory on the invoking (signing) host. This "
"option causes dgit to use I<directory> instead. Furthermore, the specified "
msgstr ""
#. type: TP
-#: ../dgit.1:1201
+#: ../dgit.1:1278
#, no-wrap
msgid "B<--force->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1209
+#: ../dgit.1:1286
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1209
+#: ../dgit.1:1286
#, no-wrap
msgid "B<--force-import-dsc-with-dgit-field>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1216
+#: ../dgit.1:1293
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1216
+#: ../dgit.1:1293
#, no-wrap
msgid "B<--force-uploading-binaries>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1221
+#: ../dgit.1:1298
msgid ""
"Carry on and upload binaries even though dgit thinks your distro does not "
"permit that."
msgstr ""
#. type: TP
-#: ../dgit.1:1221
+#: ../dgit.1:1298
#, no-wrap
msgid "B<--force-uploading-source-only>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1227
+#: ../dgit.1:1304
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1227
+#: ../dgit.1:1304
#, no-wrap
msgid "B<--force-unrepresentable>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1234
+#: ../dgit.1:1311
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1234
+#: ../dgit.1:1311
#, no-wrap
msgid "B<--force-changes-origs-exactly>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1239
+#: ../dgit.1:1316
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:1239
+#: ../dgit.1:1316
#, no-wrap
msgid "B<--force-unsupported-source-format>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1243
+#: ../dgit.1:1320
msgid ""
"Carry on despite dgit not understanding your source package format. dgit "
"will probably mishandle it."
msgstr ""
#. type: TP
-#: ../dgit.1:1243
+#: ../dgit.1:1320
#, no-wrap
msgid "B<--force-dsc-changes-mismatch>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1247
+#: ../dgit.1:1324
msgid ""
"Do not check whether .dsc and .changes match. The archive will probably "
"reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:1247
+#: ../dgit.1:1324
#, no-wrap
msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1253
+#: ../dgit.1:1330
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: =head1
-#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:1330 ../dgit-downstream-dsc.7.pod:150
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1259
+#: ../dgit.1:1336
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<-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1261
+#: ../dgit.1:1338
msgid "Settings likely to be useful for an end user include:"
msgstr ""
#. type: TP
-#: ../dgit.1:1261
+#: ../dgit.1:1338
#, no-wrap
msgid "B<dgit.default.build-products-dir>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1267
+#: ../dgit.1:1344
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:1267 ../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:1344 ../dgit-downstream-dsc.7.pod:286
#, no-wrap
msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1272
+#: ../dgit.1:1349
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1275
+#: ../dgit.1:1352
msgid "I<suite> may be a glob pattern."
msgstr ""
#. type: TP
-#: ../dgit.1:1275
+#: ../dgit.1:1352
#, no-wrap
msgid "B<dgit.default.distro>I< distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1278
+#: ../dgit.1:1355
msgid "The default distro for an unknown suite."
msgstr ""
#. type: TP
-#: ../dgit.1:1278
+#: ../dgit.1:1355
#, no-wrap
msgid "B<dgit.default.default-suite>I< suite>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1281
+#: ../dgit.1:1358
msgid "The default suite (eg for clone)."
msgstr ""
#. type: TP
-#: ../dgit.1:1281
+#: ../dgit.1:1358
#, no-wrap
msgid "B<dgit.default.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1286
+#: ../dgit.1:1363
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:1286
+#: ../dgit.1:1363
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1290
+#: ../dgit.1:1367
msgid ""
"One of the values for the command line --clean= option; used if --clean is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1290
+#: ../dgit.1:1367
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1296
+#: ../dgit.1:1373
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1296
+#: ../dgit.1:1373
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1300
+#: ../dgit.1:1377
msgid ""
"One of the values for the command line --quilt= option; used if --quilt is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1300
+#: ../dgit.1:1377
+#, no-wrap
+msgid "B<dgit-distro.>I<distro>B<.split-view>"
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1379
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1304
+#: ../dgit.1:1383
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:1304
+#: ../dgit.1:1383
#, 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:1311
+#: ../dgit.1:1390
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, "
msgstr ""
#. type: TP
-#: ../dgit.1:1311
+#: ../dgit.1:1390
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.keyid>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1315
+#: ../dgit.1:1394
msgid "See also B<-k>."
msgstr ""
#. type: TP
-#: ../dgit.1:1315
+#: ../dgit.1:1394
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1317
+#: ../dgit.1:1396
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.username>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1320
+#: ../dgit.1:1399
msgid "Not relevant for Debian."
msgstr ""
#. type: =item
-#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:1399 ../dgit-downstream-dsc.7.pod:242
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.upload-host>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1323
+#: ../dgit.1:1402
msgid "Might be useful if you have an intermediate queue server."
msgstr ""
#. type: TP
-#: ../dgit.1:1323
+#: ../dgit.1:1402
#, 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:1328
+#: ../dgit.1:1407
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, "
msgstr ""
#. type: TP
-#: ../dgit.1:1328
+#: ../dgit.1:1407
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1332
+#: ../dgit.1:1411
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:1332
+#: ../dgit.1:1411
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1337
+#: ../dgit.1:1416
msgid ""
"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
"changelog. True by default. Ignored for dgit setup-mergechangelogs, which "
msgstr ""
#. type: TP
-#: ../dgit.1:1337
+#: ../dgit.1:1416
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1343
+#: ../dgit.1:1422
msgid ""
"Whether to configure .git/info/attributes to suppress checkin/checkout file "
"content transformations in new git trees. True by default. Ignored for "
msgstr ""
#. type: TP
-#: ../dgit.1:1343
+#: ../dgit.1:1422
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1349
+#: ../dgit.1:1428
msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ."
msgstr ""
#. type: TP
-#: ../dgit.1:1349
+#: ../dgit.1:1428
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1361
+#: ../dgit.1:1440
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 --"
msgstr ""
#. type: SH
-#: ../dgit.1:1361
+#: ../dgit.1:1440
#, no-wrap
msgid "ACCESS CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1366
+#: ../dgit.1:1445
msgid ""
"There are many other settings which specify how a particular distro's "
"services (archive and git) are provided. These should not normally be "
msgstr ""
#. type: TP
-#: ../dgit.1:1366
+#: ../dgit.1:1445
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1369
+#: ../dgit.1:1448
msgid "Shown in git tags, Dgit fields, and so on."
msgstr ""
#. type: TP
-#: ../dgit.1:1369
+#: ../dgit.1:1448
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1372
+#: ../dgit.1:1451
msgid "Used for all access configuration lookup."
msgstr ""
#. type: TP
-#: ../dgit.1:1372
+#: ../dgit.1:1451
#, no-wrap
msgid "B<dgit-distro.>I<distro>B</push.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1378
+#: ../dgit.1:1457
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:1378
+#: ../dgit.1:1457
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1380
+#: ../dgit.1:1459
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1382
+#: ../dgit.1:1461
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-proto>"
msgstr ""
#. type: TP
-#: ../dgit.1:1384
+#: ../dgit.1:1463
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-path>"
msgstr ""
#. type: TP
-#: ../dgit.1:1386
+#: ../dgit.1:1465
#, 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:1388
+#: ../dgit.1:1467
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1390
+#: ../dgit.1:1469
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1392
+#: ../dgit.1:1471
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
msgstr ""
#. type: TP
-#: ../dgit.1:1394
+#: ../dgit.1:1473
#, 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<aptget:>"
+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:1396
+#: ../dgit.1:1475
#, 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:1398
+#: ../dgit.1:1477
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1400
+#: ../dgit.1:1479
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
msgstr ""
#. type: TP
-#: ../dgit.1:1402
+#: ../dgit.1:1481
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
msgstr ""
#. type: TP
-#: ../dgit.1:1404
+#: ../dgit.1:1483
#, no-wrap
-msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>"
+msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1406
+#: ../dgit.1:1485
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.ssh>"
msgstr ""
#. type: TP
-#: ../dgit.1:1408
+#: ../dgit.1:1487
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
msgstr ""
#. type: TP
-#: ../dgit.1:1410
+#: ../dgit.1:1489
#, 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:1412
+#: ../dgit.1:1491
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
msgstr ""
#. type: TP
-#: ../dgit.1:1414
+#: ../dgit.1:1493
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
msgstr ""
#. type: TP
-#: ../dgit.1:1416
+#: ../dgit.1:1495
#, 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:1418
+#: ../dgit.1:1497
#, no-wrap
msgid "B<dgit.default.old-dsc-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1420
+#: ../dgit.1:1499
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
msgstr ""
#. type: TP
-#: ../dgit.1:1422
+#: ../dgit.1:1501
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
msgstr ""
#. type: TP
-#: ../dgit.1:1424
+#: ../dgit.1:1503
#, no-wrap
msgid "B<dgit.default.dsc-url-proto-ok>"
msgstr ""
#. type: TP
-#: ../dgit.1:1426
+#: ../dgit.1:1505
#, no-wrap
msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
msgstr ""
#. type: SH
-#: ../dgit.1:1428
+#: ../dgit.1:1507
#, no-wrap
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: TP
-#: ../dgit.1:1429
+#: ../dgit.1:1508
#, no-wrap
msgid "B<DGIT_SSH>, B<GIT_SSH>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1438
+#: ../dgit.1:1517
msgid ""
"specify an alternative default program (and perhaps arguments) to use "
"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if "
msgstr ""
#. type: TP
-#: ../dgit.1:1438
+#: ../dgit.1:1517
#, no-wrap
msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1442
+#: ../dgit.1:1521
msgid ""
"Default git user.email and user.name for new trees. See B<dgit setup-new-"
"tree>."
msgstr ""
#. type: TP
-#: ../dgit.1:1442
+#: ../dgit.1:1521
#, no-wrap
msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1447
+#: ../dgit.1:1526
msgid ""
"and other subprograms and modules used by dgit are affected by various "
"environment variables. Consult the documentation for those programs for "
msgstr ""
#. type: SH
-#: ../dgit.1:1447
+#: ../dgit.1:1526
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1454
+#: ../dgit.1:1533
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1460
+#: ../dgit.1:1539
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1465
+#: ../dgit.1:1544
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1470
+#: ../dgit.1:1549
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-"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1479
+#: ../dgit.1:1558
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:1480
+#: ../dgit.1:1559
msgid "https://browse.dgit.debian.org/"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: SH
#: ../dgit.7:396
#, no-wrap
-msgid "SPLIT VIEW QUILT MODE"
+msgid "SPLIT VIEW AND SPLITTING QUILT MODES"
msgstr ""
#. type: Plain text
#. type: Plain text
#: ../dgit.7:410
msgid ""
-"When a split view mode is engaged dgit build commands and dgit push will, on "
-"each invocation, convert the user's HEAD into the dgit view, so that it can "
-"be built and/or uploaded."
+"When a splitting quilt mode is selected dgit build commands and dgit push "
+"will, on each invocation, convert the user's HEAD into the dgit view, so "
+"that it can be built and/or uploaded."
msgstr ""
#. type: Plain text
-#: ../dgit.7:417
+#: ../dgit.7:416
msgid ""
-"dgit push in split view mode will push the dgit view to the dgit git "
-"server. The dgit view is always a descendant of the maintainer view. dgit "
-"push will also make a maintainer view tag according to DEP-14 and push that "
-"to the dgit git server."
+"Split view mode can also be enabled explicitly with the --split-view command "
+"line option and the .split-view access configuration key."
msgstr ""
#. type: Plain text
-#: ../dgit.7:425
+#: ../dgit.7:429
msgid ""
-"Split view mode must be enabled explicitly (by the use of the applicable "
-"command line options, subcommands, or configuration). This is because it is "
-"not possible to reliably tell (for example) whether a git tree for a dpkg-"
-"source `3.0 (quilt)' package is a patches-applied or patches-unapplied tree."
+"When split view is in operation, regardless of the quilt mode, any dgit-"
+"generated pseudomerges and any quilt fixup commits will appear only in the "
+"dgit view. dgit push will push the dgit view to the dgit git server. The "
+"dgit view is always a descendant of the maintainer view. dgit push will "
+"also make a maintainer view tag according to DEP-14 and push that to the "
+"dgit git server."
msgstr ""
#. type: Plain text
-#: ../dgit.7:429
+#: ../dgit.7:437
+msgid ""
+"Splitting quilt modes must be enabled explicitly (by the use of the "
+"applicable command line options, subcommands, or configuration). This is "
+"because it is not possible to reliably tell (for example) whether a git "
+"tree for a dpkg-source `3.0 (quilt)' package is a patches-applied or patches-"
+"unapplied tree."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.7:441
msgid ""
"Split view conversions are cached in the ref dgit-intern/quilt-cache. This "
"should not be manipulated directly."
msgstr ""
#. type: SH
-#: ../dgit.7:429
+#: ../dgit.7:441
#, no-wrap
msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:432
+#: ../dgit.7:444
msgid ""
"This section is mainly of interest to maintainers who want to use dgit with "
"their existing git history for the Debian package."
msgstr ""
#. type: Plain text
-#: ../dgit.7:438
+#: ../dgit.7:450
msgid ""
"Some developers like to have an extra-clean git tree which lacks files which "
"are normally found in source tarballs and therefore in Debian source "
msgstr ""
#. type: Plain text
-#: ../dgit.7:443
+#: ../dgit.7:455
msgid ""
"dgit requires that the source package unpacks to exactly the same files as "
"are in the git commit on which dgit push operates. So if you just try to "
msgstr ""
#. type: Plain text
-#: ../dgit.7:445
+#: ../dgit.7:457
msgid "As the maintainer you therefore have the following options:"
msgstr ""
#. type: TP
-#: ../dgit.7:445 ../dgit.7:456 ../dgit.7:505 ../dgit.7:513
+#: ../dgit.7:457 ../dgit.7:468 ../dgit.7:517 ../dgit.7:525
#, no-wrap
msgid "\\(bu"
msgstr ""
#. type: Plain text
-#: ../dgit.7:456
+#: ../dgit.7:468
msgid ""
"Delete the files from your git branches, and your Debian source packages, "
"and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this "
msgstr ""
#. type: Plain text
-#: ../dgit.7:462
+#: ../dgit.7:474
msgid ""
"Persuade upstream that the source code in their git history and the source "
"they ship as tarballs should be identical. Of course simply removing the "
msgstr ""
#. type: Plain text
-#: ../dgit.7:468
+#: ../dgit.7:480
msgid ""
"One answer is to commit the (maybe autogenerated) files, perhaps with some "
"simple automation to deal with conflicts and spurious changes. This has the "
msgstr ""
#. type: Plain text
-#: ../dgit.7:473
+#: ../dgit.7:485
msgid ""
"Of course it may also be that the differences are due to build system bugs, "
"which cause unintended files to end up in the source package. dgit will "
msgstr ""
#. type: SH
-#: ../dgit.7:474
+#: ../dgit.7:486
#, no-wrap
msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:478
+#: ../dgit.7:490
msgid ""
"Some upstream tarballs contain build artifacts which upstream expects some "
"users not to want to rebuild (or indeed to find hard to rebuild), but which "
msgstr ""
#. type: Plain text
-#: ../dgit.7:488
+#: ../dgit.7:500
msgid ""
"Examples sometimes include crossbuild firmware binaries and documentation. "
"To avoid problems when building updated source packages (in particular, to "
msgstr ""
#. type: Plain text
-#: ../dgit.7:496
+#: ../dgit.7:508
msgid ""
"dpkg-source does not (with any of the commonly used source formats) "
"represent deletion of binaries (outside debian/) present in upstream. Thus "
msgstr ""
#. type: Plain text
-#: ../dgit.7:502
+#: ../dgit.7:514
msgid ""
"However, git does always properly record file deletion. Since dgit's "
"principle is that the dgit git tree is the same of dpkg-source -x, that "
msgstr ""
#. type: Plain text
-#: ../dgit.7:505
+#: ../dgit.7:517
msgid ""
"For the non-maintainer, this can be observed in the following suboptimal "
"occurrences:"
msgstr ""
#. type: Plain text
-#: ../dgit.7:513
+#: ../dgit.7:525
msgid ""
"The package clean target often deletes these files, making the git tree "
"dirty trying to build the source package, etc. This can be fixed by using "
msgstr ""
#. type: Plain text
-#: ../dgit.7:520
+#: ../dgit.7:532
msgid ""
"The package build modifies these files, so that builds make the git tree "
"dirty. This can be worked around by using `git reset --hard' after each "
msgstr ""
#. type: Plain text
-#: ../dgit.7:530
+#: ../dgit.7:542
msgid ""
"From the maintainer's point of view, the main consequence is that to make a "
"dgit-compatible git branch it is necessary to commit these files to git. "
msgstr ""
#. type: SH
-#: ../dgit.7:530
+#: ../dgit.7:542
#, no-wrap
msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:538
+#: ../dgit.7:550
msgid ""
"A related problem is other unexpected behaviour by a package's B<clean> "
"target. If a package's rules modify files which are distributed in the "
msgstr ""
#. type: Plain text
-#: ../dgit.7:546
+#: ../dgit.7:558
msgid ""
"Again, the solution is to use B<dgit -wg> aka B<--clean=git>, which "
"instructs dgit to use git clean instead of the package's build target, along "
msgstr ""
#. type: Plain text
-#: ../dgit.7:550
+#: ../dgit.7:562
msgid ""
"This is 100% reliable, but has the downside that if you forget to git add or "
"to commit, and then use B<dgit -wg> or B<git reset --hard>, your changes may "
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
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
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
#. type: =item
#: ../git-debrebase.1.pod:534
-msgid "--experimntal-merge-resolution"
+msgid "--experimental-merge-resolution"
msgstr ""
#. type: textblock
#. type: textblock
#: ../git-debrebase.1.pod:621
-msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)"
+msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
-#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../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:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
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
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
+#. type: =head1
+#: ../dgit-maint-bpo.7.pod:11 ../git-debrebase.5.pod:37
+msgid "TERMINOLOGY"
+msgstr ""
+
#. type: textblock
#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
msgid ""
"output than the default."
msgstr ""
-#. type: =head1
-#: ../git-debrebase.5.pod:37
-msgid "TERMINOLOGY"
-msgstr ""
-
#. type: =item
#: ../git-debrebase.5.pod:41
msgid "Pseudomerge"
#. type: textblock
#: ../git-debrebase.5.pod:394
msgid ""
-"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
+"See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours "
"should be be avoided because they might generate such merges."
msgstr ""