diff options
Diffstat (limited to 'po4a/dgit-maint-debrebase_7.pot')
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index eed6cd5..1decaa5 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-12-29 00:50+0000\n" +"POT-Creation-Date: 2023-10-29 17:49+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" @@ -28,12 +28,12 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 -#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -68,8 +68,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 -#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 #: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -108,7 +108,7 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 #: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" @@ -174,8 +174,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 -#: ../dgit-maint-merge.7.pod:489 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 #: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" @@ -238,17 +238,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -256,7 +256,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:370 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 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 " @@ -264,7 +264,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:399 ../dgit-maint-debrebase.7.pod:376 +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 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 " @@ -273,12 +273,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -286,12 +286,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -299,7 +299,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 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 " @@ -307,12 +307,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-debrebase.7.pod:591 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 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>. " @@ -321,20 +321,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 #: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 #: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:553 ../dgit-maint-debrebase.7.pod:798 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -1396,5 +1396,5 @@ msgstr "" #. type: textblock #: ../dgit-maint-debrebase.7.pod:794 -msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" +msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5), gitrevisions(7)" msgstr "" |