diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 01:37:03 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 01:37:03 +0100 |
commit | ffb9335e93d9c539dd61e62cf1ebcd834e363d72 (patch) | |
tree | 5a101e6f09293611eb80064a2d3ddff38cd061d8 /po4a/dgit_7.pot | |
parent | e82d9492c0a63d75c96e2ebdbc93300d57927d60 (diff) |
i18n-commit - autogenerated
Diffstat (limited to 'po4a/dgit_7.pot')
-rw-r--r-- | po4a/dgit_7.pot | 102 |
1 files changed, 57 insertions, 45 deletions
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index 1329e77..f41a2b8 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 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" @@ -33,18 +33,20 @@ msgstr "" #: ../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 "" @@ -642,7 +644,7 @@ msgstr "" #. type: SH #: ../dgit.7:396 #, no-wrap -msgid "SPLIT VIEW QUILT MODE" +msgid "SPLIT VIEW AND SPLITTING QUILT MODES" msgstr "" #. type: Plain text @@ -656,51 +658,61 @@ msgstr "" #. 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 " @@ -710,7 +722,7 @@ msgid "" 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 " @@ -718,18 +730,18 @@ msgid "" 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 " @@ -740,7 +752,7 @@ msgid "" 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 " @@ -748,7 +760,7 @@ msgid "" 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 " @@ -757,7 +769,7 @@ msgid "" 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 " @@ -766,13 +778,13 @@ msgid "" 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 " @@ -780,7 +792,7 @@ msgid "" 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 " @@ -790,7 +802,7 @@ msgid "" 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 " @@ -800,7 +812,7 @@ msgid "" 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 " @@ -808,14 +820,14 @@ msgid "" 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 " @@ -824,7 +836,7 @@ msgid "" 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 " @@ -832,7 +844,7 @@ msgid "" 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. " @@ -843,13 +855,13 @@ msgid "" 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 " @@ -858,7 +870,7 @@ msgid "" 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 " @@ -866,7 +878,7 @@ msgid "" 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 " |