summaryrefslogtreecommitdiff
path: root/po4a/dgit-maint-merge_7.pot
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-09-16 15:31:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-09-16 15:31:50 -0700
commitb773eefd1773bc2195f87f03721c89f7efb498f3 (patch)
treeb5e6e444b9f0786132a8f798bd6141878521cf7d /po4a/dgit-maint-merge_7.pot
parent1045e26443f21378d6fb98a46ace40c0d883cea6 (diff)
parent896c94474922bc2698474c5ba57321fa61504238 (diff)
Merge tag 'debian/9.9' into buster-bpo
dgit release 9.9 for unstable (sid) [dgit] [dgit distro=debian no-split] # gpg: Signature made Sat 14 Sep 2019 01:35:57 PM MST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
Diffstat (limited to 'po4a/dgit-maint-merge_7.pot')
-rw-r--r--po4a/dgit-maint-merge_7.pot14
1 files changed, 7 insertions, 7 deletions
diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot
index 129dca5..7bd423c 100644
--- a/po4a/dgit-maint-merge_7.pot
+++ b/po4a/dgit-maint-merge_7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-07-21 01:37+0100\n"
+"POT-Creation-Date: 2019-09-08 20:11+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"
@@ -46,13 +46,13 @@ msgid "3."
msgstr ""
#. type: =head1
-#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1568 ../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: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
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:254
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -61,7 +61,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
-#: ../dgit-maint-bpo.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 ""
@@ -671,7 +671,7 @@ msgstr ""
#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
-" % git remote update\n"
+" % git fetch --tags upstream\n"
"\n"
msgstr ""
@@ -895,7 +895,7 @@ msgstr ""
#. type: =head1
#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
-#: ../git-debpush.1.pod:228
+#: ../git-debpush.1.pod:259
msgid "AUTHOR"
msgstr ""