diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
| commit | 35ac30ee373c5ed84d7c2c5a701ac2d54963504d (patch) | |
| tree | 59da7e2385b396052c4f53ac187d520c00d2790c /doc | |
| parent | e5c2b7e8a5455e1dc6993ef9e151b3845fb53c60 (diff) | |
| parent | c035b6552ba4bd1c6fba5fd8f8d829c2efbefe3c (diff) | |
Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess
Conflicts:
apt-pkg/install-progress.cc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-verbatim.ent | 4 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 11f722fbf..21b62e452 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,14 +219,14 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.14"> +<!ENTITY apt-product-version "0.9.14.1"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> <!ENTITY stable-version "7"> -<!ENTITY ubuntu-codename "precise"> +<!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… It is not a remark about the specific perl version. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index d2fbb8579..8867b13e9 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 0.9.9.4\n" +"Project-Id-Version: apt-doc 0.9.14\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-12-07 14:40+0100\n" +"POT-Creation-Date: 2013-12-12 18:37+0100\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" |