diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
commit | 15ccc2a685b0b884b393e356f9960e86f97f532d (patch) | |
tree | 920a1fcf6fa2c92a05d0d1d2ccb22eb32b88522e /doc/po/apt-doc.pot | |
parent | a40c6649b99814c7d30964accdd5ecc4f1ce369a (diff) | |
parent | 506ab3c78fb67f5e452a1748f4870af767de5ebb (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r-- | doc/po/apt-doc.pot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 8eebad5e8..b107cd90d 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.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-10 10:18+0200\n" +"POT-Creation-Date: 2014-04-25 13:17+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" @@ -642,7 +642,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:151 -msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled." +msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled." msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> @@ -1280,7 +1280,7 @@ msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " "data see README.progress-reporting in the apt doc directory. Configuration " -"Item: <literal>DpkgPM::Progress</literal> and " +"Item: <literal>Dpkg::Progress</literal> and " "<literal>Dpkg::Progress-Fancy</literal>." msgstr "" |