diff options
Diffstat (limited to 'po4a/dgit-maint-native_7.pot')
| -rw-r--r-- | po4a/dgit-maint-native_7.pot | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index 43d7d51..35976d3 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_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: 2022-12-29 00:50+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" @@ -21,18 +21,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-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.1:1676 ../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-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-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,13 +43,13 @@ 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.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-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" @@ -126,25 +128,24 @@ msgstr "" #: ../dgit-maint-native.7.pod:61 #, no-wrap msgid "" -" % dgit -wgf sbuild -A -c sid\n" -" % dgit -wgf --overwrite push\n" +" % dgit -wgf --overwrite push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:66 +#: ../dgit-maint-native.7.pod:65 msgid "(Do not make any tags yourself: dgit push will do that.)" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:68 +#: ../dgit-maint-native.7.pod:67 msgid "" "You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit " "sbuild>; see dgit(1) for the syntax of those subcommands." msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:72 +#: ../dgit-maint-native.7.pod:71 msgid "" "The --overwrite option tells dgit that you are expecting that your git " "history is not a descendant of the history which dgit synthesised from the " @@ -152,7 +153,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:77 +#: ../dgit-maint-native.7.pod:76 msgid "" "dgit will make a merge commit on your branch but without making any code " "changes (ie, a pseudo-merge) so that your history, which will be pushed to " @@ -160,7 +161,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:85 +#: ../dgit-maint-native.7.pod:84 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " "avoid this merge commit by passing C<--deliberately-not-fast-forward> " @@ -169,30 +170,30 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:93 +#: ../dgit-maint-native.7.pod:92 msgid "SUBSEQUENT PUSHES" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:97 +#: ../dgit-maint-native.7.pod:96 #, no-wrap msgid "" -" % dgit -wgf push\n" +" % dgit -wgf push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:101 ../dgit-maint-native.7.pod:111 +#: ../dgit-maint-native.7.pod:100 ../dgit-maint-native.7.pod:110 msgid "That's it." msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:103 +#: ../dgit-maint-native.7.pod:102 msgid "INCORPORATING AN NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:540 #, no-wrap msgid "" " % dgit pull\n" @@ -200,12 +201,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:113 +#: ../dgit-maint-native.7.pod:112 msgid "Or, if you would prefer to review the changes, you can do this:" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:118 +#: ../dgit-maint-native.7.pod:117 #, no-wrap msgid "" " % dgit fetch\n" @@ -214,7 +215,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:123 +#: ../dgit-maint-native.7.pod:122 msgid "" "If you do not merge the NMU into your own git history, the next push will " "then require I<--overwrite>." |