diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
commit | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (patch) | |
tree | 59969ad6463918810ca264854615e8b2cfdf0bad /doc/po/apt-doc.pot | |
parent | f3594b9de99745c84563bac3ef59a159e30d4cd8 (diff) | |
parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/apt.dirs
debian/changelog
Diffstat (limited to 'doc/po/apt-doc.pot')
-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 7c42fc1e4..9294cca97 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.2\n" +"Project-Id-Version: apt-doc 1.0.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-25 13:52+0200\n" +"POT-Creation-Date: 2014-05-05 16:26+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" |