summaryrefslogtreecommitdiff
path: root/po4a/dgit-maint-gbp_7.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po4a/dgit-maint-gbp_7.pot')
-rw-r--r--po4a/dgit-maint-gbp_7.pot50
1 files changed, 30 insertions, 20 deletions
diff --git a/po4a/dgit-maint-gbp_7.pot b/po4a/dgit-maint-gbp_7.pot
index d1daa27..f991710 100644
--- a/po4a/dgit-maint-gbp_7.pot
+++ b/po4a/dgit-maint-gbp_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: 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:1394 ../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.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,7 +43,7 @@ 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 ""
@@ -51,8 +53,8 @@ msgid "BUILDING"
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 ""
@@ -65,14 +67,15 @@ msgid ""
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:536 ../dgit-maint-gbp.7.pod:133
+#: ../dgit-maint-debrebase.7.pod:596
msgid "INCORPORATING NMUS"
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:551 ../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 ""
@@ -108,7 +111,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293
+#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:334
msgid "GIT CONFIGURATION"
msgstr ""
@@ -235,7 +238,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-gbp.7.pod:105
+#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:173
#, no-wrap
msgid ""
" % dgit --gbp push-source\n"
@@ -248,7 +251,7 @@ msgid "or if you need to include binaries,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173
+#: ../dgit-maint-gbp.7.pod:113
#, no-wrap
msgid ""
" % dgit --gbp push\n"
@@ -280,7 +283,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-gbp.7.pod:132
+#: ../dgit-maint-gbp.7.pod:130
+msgid ""
+"Alternatively, you can use git-debpush(1). For the first upload you should "
+"pass the B<--gbp> quilt mode option (see git-debpush(1))."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-gbp.7.pod:135
msgid ""
"B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp "
"branches. You can just apply the NMU diff the traditional way. The next "
@@ -288,7 +298,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-gbp.7.pod:142
+#: ../dgit-maint-gbp.7.pod:145
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>."