diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
| commit | 0f3150e7040f45565b459a1390606bc2f714f6a8 (patch) | |
| tree | 200b65a080c246b09e6bcdcd81ea82c824272600 /doc/po | |
| parent | 314b47542c57d0a12c55dd1dd334cf233a33fcfb (diff) | |
| parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) | |
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'doc/po')
| -rw-r--r-- | doc/po/apt-doc.pot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index c403ad8e4..d9ea5f6ad 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.0.9.5\n" +"Project-Id-Version: apt-doc 1.0.9.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2015-01-16 04:37-0500\n" +"POT-Creation-Date: 2015-04-13 07:23+0200\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" |