diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 10:47:09 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 10:47:09 +0200 |
commit | 2e8e5aaca4e51737e5a3a56c140d6817251bf0f7 (patch) | |
tree | 1b1224e9b55d4e7f0002feeba51711912d8fb314 /doc/po | |
parent | d667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d (diff) | |
parent | 536fdb8823fdec24c26d984317b8162237c427c3 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'doc/po')
-rw-r--r-- | doc/po/apt-doc.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 83e1de724..5538e4a04 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-09-18 07:57+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" |