diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
commit | b773eefd1773bc2195f87f03721c89f7efb498f3 (patch) | |
tree | b5e6e444b9f0786132a8f798bd6141878521cf7d /po4a/git-debrebase_5.pot | |
parent | 1045e26443f21378d6fb98a46ace40c0d883cea6 (diff) | |
parent | 896c94474922bc2698474c5ba57321fa61504238 (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/git-debrebase_5.pot')
-rw-r--r-- | po4a/git-debrebase_5.pot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index 91ac1c8..238be6a 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-08-10 19:42+0100\n" +"POT-Creation-Date: 2019-09-06 23:47+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" @@ -28,7 +28,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1555 ../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 @@ -914,7 +914,7 @@ msgid "" "The full set of annotations is:\n" " [git-debrebase split: mixed commit, debian part]\n" " [git-debrebase split: mixed commit, upstream-part]\n" -" [git-debrebase onvert dgit import: debian changes]\n" +" [git-debrebase convert dgit import: debian changes]\n" " [git-debrebase anchor: convert dgit import, upstream changes]\n" "\n" msgstr "" |