diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-20 10:21:58 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-20 10:21:58 -0700 |
| commit | 4ea49240ddaa77bb4e290f9018727805ef87efc6 (patch) | |
| tree | ecc5ef8ce55fa7cce83ebc9554edeb29920ea2cf /po4a/dgit_7.pot | |
| parent | c1594eccda40a6a40bb2eb330a13578f330b3cc9 (diff) | |
| parent | 16d99b2680f6c4e41c7740f542ca064455b4f5a4 (diff) | |
Merge tag 'debian/8.0' into stretch-bpo
dgit release 8.0 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sat 13 Oct 2018 04:01:49 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'po4a/dgit_7.pot')
| -rw-r--r-- | po4a/dgit_7.pot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index cd5145e..78ed743 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-04 01:04+0100\n" +"POT-Creation-Date: 2018-10-13 20:41+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" @@ -39,11 +39,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1445 ../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 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -494,7 +494,7 @@ msgstr "" #. type: Plain text #: ../dgit.7:303 msgid "" -"Simply commiting to source files (whether in debian/ or not, but not to " +"Simply committing to source files (whether in debian/ or not, but not to " "patches) will result in a branch that dgit quilt-fixup can linearise. " "Other kinds of changes, including editing patches or merging, cannot be " "handled this way." @@ -733,7 +733,7 @@ msgstr "" msgid "" "Delete the files from your git branches, and your Debian source packages, " "and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this " -"means represeting the deletions as patches. You may need to pass --include-" +"means representing the deletions as patches. You may need to pass --include-" "removal to dpkg-source --commit, or pass corresponding options to other " "tools.) This can make the Debian source package less useful for people " "without Debian build infrastructure." |