From 595da25c3a797d654941b6867313eb8f5430cc50 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 13 Oct 2018 20:41:46 +0100 Subject: i18n-commit - autogenerated --- po4a/dgit-sponsorship_7.pot | 8 +- po4a/dgit_1.pot | 570 ++++++++++++++++++++++++-------------------- po4a/dgit_7.pot | 10 +- 3 files changed, 325 insertions(+), 263 deletions(-) (limited to 'po4a') diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot index fb45886..16d8859 100644 --- a/po4a/dgit-sponsorship_7.pot +++ b/po4a/dgit-sponsorship_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2018-10-13 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -517,7 +517,7 @@ msgid "" "You will need to pass C<--overwrite> to dgit push for every successive " "upload. This disables a safety catch which would normally spot situations " "where changes are accidentally lost. When your sponsee is sending you " -"source packages - perhaps multiple source pacakges with the same version " +"source packages - perhaps multiple source packages with the same version " "number - these safety catches are inevitably ineffective." msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 8a7fd86..ff4a730 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2018-10-13 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -317,7 +317,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:137 msgid "" -"dgit checkout will normally need to aceess the archive server, to " +"dgit checkout will normally need to access the archive server, to " "canonicalise the provided suite name. The exception is if you specify the " "canonical name, and the branch (or tracking branch) already exists." msgstr "" @@ -345,8 +345,8 @@ msgstr "" #. type: Plain text #: ../dgit.1:152 msgid "" -"dgit's build operations access the the network, to get the -v option right. " -"See -v, below." +"dgit's build operations access the network, to get the -v option right. See " +"-v, below." msgstr "" #. type: TP @@ -417,7 +417,7 @@ msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1123 +#: ../dgit.1:185 ../dgit.1:1168 msgid "Print a usage summary." msgstr "" @@ -843,7 +843,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:428 -msgid "There is only only sub-option:" +msgid "There is only one sub-option:" msgstr "" #. type: Plain text @@ -859,7 +859,7 @@ msgstr "" #: ../dgit.1:453 msgid "" "If I is prefixed with B<+> then if it already exists, it will be " -"simply ovewritten, no matter its existing contents. If I is " +"simply overwritten, no matter its existing contents. If I is " "prefixed with B<..> then if it already exists and dgit actually imports the " "dsc (rather than simply reading the git commit out of the Dgit field), dgit " "will make a pseudomerge so that the result is necessarily fast forward from " @@ -919,7 +919,7 @@ msgstr "" #: ../dgit.1:476 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " -"it to exclude exactly the .git diredcory and nothing else. The separate " +"it to exclude exactly the .git directory and nothing else. The separate " "arguments are unquoted, separated by spaces, and do not contain spaces." msgstr "" @@ -1054,41 +1054,46 @@ msgid "" "dependencies." msgstr "" -#. type: TP -#: ../dgit.1:541 -#, no-wrap -msgid "B<--clean=git-ff> | B<-wgf>" -msgstr "" - #. type: Plain text -#: ../dgit.1:550 +#: ../dgit.1:555 msgid "" +"dgit will only actually clean the tree if it needs to (because it needs to " +"build the source package or binaries from your working tree). Otherwise any " +"untracked files will be simply ignored. p.TP B<--clean=git-ff> | B<-wgf> " "Use B to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " "only unusual packages are likely to create)." msgstr "" #. type: TP -#: ../dgit.1:550 +#: ../dgit.1:555 #, no-wrap -msgid "B<--clean=check> | B<-wc>" +msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:556 +#: ../dgit.1:561 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" +#. type: Plain text +#: ../dgit.1:572 +msgid "" +"With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " +"tolerated, so only files which show up as B in git status (ie, ones you " +"maybe forgot to git add) are treated as a problem." +msgstr "" + #. type: TP -#: ../dgit.1:556 +#: ../dgit.1:572 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:564 +#: ../dgit.1:580 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1097,42 +1102,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:564 +#: ../dgit.1:580 #, no-wrap -msgid "B<--clean=dpkg-source> | B<-wd>" +msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:570 +#: ../dgit.1:585 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " -"by dpkg-source running the package's clean target. This is the default. " -"Requires the package's build dependencies." +"by dpkg-source running the package's clean target. --clean=dpkg-source is " +"the default." +msgstr "" + +#. type: Plain text +#: ../dgit.1:589 +msgid "Without the extra B, requires the package's build dependencies." +msgstr "" + +#. type: Plain text +#: ../dgit.1:599 +msgid "" +"With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " +"passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " +"practice." +msgstr "" + +#. type: Plain text +#: ../dgit.1:606 +msgid "" +"The rules clean target will only be run if it is needed: when dgit is going " +"to build source or binary packages from your working tree, rather than from " +"your git branch (for example because of --include-dirty or because the " +"binary package build uses your working tree)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:616 +msgid "" +"In all cases, dgit will check that there are (after rules clean, if " +"applicable) no untracked un-ignored files, in case these are files you " +"forgot to git add. (Except that this check is not done for a `3.0 (quilt)' " +"package when dgit has to apply patches, dirtily, to the working tree.) If " +"your package does not have a good .gitignore you will probably need --" +"clean=dpkg-source,no-check aka -wdn." msgstr "" #. type: TP -#: ../dgit.1:570 +#: ../dgit.1:616 #, no-wrap -msgid "B<--clean=dpkg-source-d> | B<-wdd>" +msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:580 +#: ../dgit.1:620 msgid "" -"Use B to do the clean, so that the source package is " -"cleaned by dpkg-source running the package's clean target. The build-" -"dependencies are not checked (due to B<-d>), which violates policy, but may " -"work in practice." +"Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:580 +#: ../dgit.1:620 +#, no-wrap +msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:625 +msgid "" +"Like --clean=dpkg-source, but fails even on ignored untracked files. This " +"could perhaps be used to detect bugs in your rules clean target." +msgstr "" + +#. type: TP +#: ../dgit.1:625 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:586 +#: ../dgit.1:631 msgid "" "The package is or may be new in this suite. Without this, dgit will refuse " "to push. It may (for Debian, will) be unable to access the git history for " @@ -1140,13 +1188,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:586 +#: ../dgit.1:631 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:594 +#: ../dgit.1:639 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1156,24 +1204,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:594 +#: ../dgit.1:639 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:597 +#: ../dgit.1:642 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:597 +#: ../dgit.1:642 #, no-wrap msgid "B<--overwrite>[=I]" msgstr "" #. type: Plain text -#: ../dgit.1:608 +#: ../dgit.1:653 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:619 +#: ../dgit.1:664 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 " @@ -1197,14 +1245,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:625 +#: ../dgit.1:670 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See BI<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:639 +#: ../dgit.1:684 msgid "" "If I is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1215,7 +1263,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:645 +#: ../dgit.1:690 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 " @@ -1224,7 +1272,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:650 +#: ../dgit.1:695 msgid "" "(In quilt mode B, B or B, implying a split between the " "dgit view and the maintainer view, the pseudo-merge will appear only in the " @@ -1232,18 +1280,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:650 +#: ../dgit.1:695 #, no-wrap msgid "B<--delayed>=I" msgstr "" #. type: Plain text -#: ../dgit.1:653 +#: ../dgit.1:698 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:663 +#: ../dgit.1:708 msgid "" "B If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1253,27 +1301,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:668 +#: ../dgit.1:713 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:668 +#: ../dgit.1:713 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:674 +#: ../dgit.1:719 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:684 +#: ../dgit.1:729 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 " @@ -1282,7 +1330,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:692 +#: ../dgit.1:737 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 " @@ -1291,13 +1339,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:692 +#: ../dgit.1:737 #, no-wrap msgid "B<--save-dgit-view=>I|I" msgstr "" #. type: Plain text -#: ../dgit.1:702 +#: ../dgit.1:747 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 " @@ -1306,7 +1354,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:709 +#: ../dgit.1:754 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective with --[quilt=]gbp, --" @@ -1314,25 +1362,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:713 +#: ../dgit.1:758 msgid "" -"If ref does not start with refs/ it is taken to to be a branch - i.e. refs/" +"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:717 +#: ../dgit.1:762 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:717 +#: ../dgit.1:762 #, no-wrap msgid "B<--deliberately->I" msgstr "" #. type: Plain text -#: ../dgit.1:731 +#: ../dgit.1:776 msgid "" "Declare that you are deliberately doing I. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1344,13 +1392,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:731 +#: ../dgit.1:776 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:782 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 " @@ -1359,7 +1407,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:748 +#: ../dgit.1:793 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 --" @@ -1369,13 +1417,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:748 +#: ../dgit.1:793 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:757 +#: ../dgit.1:802 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1387,13 +1435,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:757 +#: ../dgit.1:802 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:762 +#: ../dgit.1:807 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 " @@ -1401,13 +1449,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:762 +#: ../dgit.1:807 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:769 +#: ../dgit.1:814 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 " @@ -1415,20 +1463,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:774 +#: ../dgit.1:819 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:774 +#: ../dgit.1:819 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:783 +#: ../dgit.1:828 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 " @@ -1438,13 +1486,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:783 +#: ../dgit.1:828 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:833 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 " @@ -1452,7 +1500,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:839 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 " @@ -1461,13 +1509,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:794 +#: ../dgit.1:839 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:802 +#: ../dgit.1:847 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 " @@ -1476,13 +1524,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:802 +#: ../dgit.1:847 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:807 +#: ../dgit.1:852 msgid "" "Do not check whether up source format `3.0 (quilt)' metadata needs fixing " "up. If you use this option and the metadata did in fact need fixing up, " @@ -1490,20 +1538,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:807 +#: ../dgit.1:852 #, no-wrap msgid "B<-->[B]B | B<-->[B]B | B<--quilt=unapplied>" msgstr "" #. type: Plain text -#: ../dgit.1:814 +#: ../dgit.1:859 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:822 +#: ../dgit.1:867 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 " @@ -1512,7 +1560,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:830 +#: ../dgit.1:875 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 " @@ -1520,7 +1568,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:835 +#: ../dgit.1:880 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 " @@ -1528,7 +1576,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:853 +#: ../dgit.1:898 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 " @@ -1541,7 +1589,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:862 +#: ../dgit.1:907 msgid "" "B This is because it is not always possible to tell: a " @@ -1553,13 +1601,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:862 +#: ../dgit.1:907 #, no-wrap msgid "B<-d>I | B<--distro=>I" msgstr "" #. type: Plain text -#: ../dgit.1:871 +#: ../dgit.1:916 msgid "" "Specifies that the suite to be operated on is part of distro I. " "This overrides the default value found from the git config option BI" msgstr "" #. type: Plain text -#: ../dgit.1:887 +#: ../dgit.1:932 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for single .changes file in the parent directory whose filename " @@ -1600,7 +1648,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:896 +#: ../dgit.1:941 msgid "" "If the specified I pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1608,17 +1656,17 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:896 +#: ../dgit.1:941 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:953 msgid "" "When doing a build, delete any changes files matching " "IB<_>IB<_*.changes> before starting. This ensures that " -"dgit push (and dgit sbuild) will be able to unambigously identify the " +"dgit push (and dgit sbuild) will be able to unambiguously identify the " "relevant changes files from the most recent build, even if there have been " "previous builds with different tools or options. The default is not to " "remove, but B<--no-rm-old-changes> can be used to override a previous --rm-" @@ -1626,32 +1674,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:911 +#: ../dgit.1:956 msgid "" "Note that B will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:911 +#: ../dgit.1:956 #, no-wrap msgid "B<--build-products-dir=>I" msgstr "" #. type: Plain text -#: ../dgit.1:915 +#: ../dgit.1:960 msgid "" -"Specifies where to find and create tarballs, binry packages, source " +"Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:918 +#: ../dgit.1:963 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:972 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B" msgstr "" #. type: Plain text -#: ../dgit.1:930 +#: ../dgit.1:975 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:930 +#: ../dgit.1:975 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:937 +#: ../dgit.1:982 msgid "" "Generates a DEP-14 tag (eg BI) as well as a dgit tag (eg " "BI) where possible. This is the default." msgstr "" #. type: TP -#: ../dgit.1:937 +#: ../dgit.1:982 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:943 +#: ../dgit.1:988 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 " @@ -1698,52 +1746,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:943 +#: ../dgit.1:988 #, no-wrap msgid "B<--dep14tag-always>" msgstr "" #. type: Plain text -#: ../dgit.1:948 +#: ../dgit.1:993 msgid "" "Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " "not support that, dgit push will fail." msgstr "" #. type: TP -#: ../dgit.1:948 +#: ../dgit.1:993 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:952 +#: ../dgit.1:997 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:952 +#: ../dgit.1:997 #, no-wrap msgid "B<-c>IB<=>I" msgstr "" #. type: Plain text -#: ../dgit.1:956 +#: ../dgit.1:1001 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:956 +#: ../dgit.1:1001 #, no-wrap msgid "B<-v>I|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:965 +#: ../dgit.1:1010 msgid "" "Specifies the B<-v>I option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1753,7 +1801,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:971 +#: ../dgit.1:1016 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 " @@ -1761,30 +1809,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:971 +#: ../dgit.1:1016 #, no-wrap msgid "B<-m>I" msgstr "" #. type: Plain text -#: ../dgit.1:974 +#: ../dgit.1:1019 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:974 +#: ../dgit.1:1019 #, no-wrap msgid "B<--ch:>I