diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
| commit | db1d1c32149177c0b6ca49e5107ab1f5fd364660 (patch) | |
| tree | b06b22a9c92455b32889c88407f4190113a5cdd9 /doc/po/apt-doc.pot | |
| parent | 916b89109cd77728004819d4705778e3dc489b2e (diff) | |
| parent | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc
test/integration/test-hashsum-verification
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 b18552933..5538e4a04 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.7\n" +"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-08-28 00:44+0000\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" |