diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /po4a/git-debrebase_5.pot | |
parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'po4a/git-debrebase_5.pot')
-rw-r--r-- | po4a/git-debrebase_5.pot | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index 71601b1..dd07290 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.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" @@ -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.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 "" @@ -41,10 +43,15 @@ 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.1.pod:10 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:11 ../git-debrebase.5.pod:37 +msgid "TERMINOLOGY" +msgstr "" + #. type: textblock #: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7 msgid "" @@ -96,11 +103,6 @@ msgid "" "output than the default." msgstr "" -#. type: =head1 -#: ../git-debrebase.5.pod:37 -msgid "TERMINOLOGY" -msgstr "" - #. type: =item #: ../git-debrebase.5.pod:41 msgid "Pseudomerge" @@ -620,7 +622,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:394 msgid "" -"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours " +"See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours " "should be be avoided because they might generate such merges." msgstr "" |