diff options
author | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
commit | accd8215ca9a1cb10e92a059d71eb02aac2f0743 (patch) | |
tree | ad673f0421bf5dc2b3f6ab5e91f5dd074bd2661c /doc/po | |
parent | b32f5e0d93608f82a7516440a6da7a3131eb358e (diff) | |
parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) |
Merge branch 'debian/jessie' into ubuntu/master1.0.9.9ubuntu1
Conflicts:
configure.ac
debian/changelog
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" |