diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
| commit | fa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch) | |
| tree | bdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 /po4a/dgit_7.pot | |
| parent | 5eb8e042adf67fc5a7a25a1694b4df1dd50b44de (diff) | |
| parent | 0594f61c6ea940a4d88bffb5384f775d5a7be194 (diff) | |
Merge tag 'debian/8.5' into stretch-bpo
dgit release 8.5 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7 CBA1 E3E3 3923 48B5 0D39
Diffstat (limited to 'po4a/dgit_7.pot')
| -rw-r--r-- | po4a/dgit_7.pot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index 78ed743..1329e77 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+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" @@ -39,11 +39,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../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:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 +#: ../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 #, no-wrap msgid "SEE ALSO" @@ -292,7 +292,7 @@ msgstr "" #: ../dgit.7:166 msgid "" "When using this facility, it is important to always specify the same suites " -"in the same order: dgit will not be make a coherent fast-forwarding history " +"in the same order: dgit will not make a coherent fast-forwarding history " "view otherwise." msgstr "" @@ -611,7 +611,7 @@ msgstr "" #: ../dgit.7:371 msgid "" "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " -"edge which cannot be sensibly be either ignored, or turned into a patch in " +"edge which cannot sensibly be either ignored, or turned into a patch in " "debian/patches. In this example, this is because it itself changes files in " "debian/patches, indicating that something unusual is going on and that " "continuing is not safe. But you might also see other kinds of troublesome " |