From bfa4d690e7262c19b2f0bfc3905177c37f42cf34 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Aug 2010 12:59:05 +0200 Subject: * apt/debfile.py: - fix crash in DscFile handling and add regression test --- po/python-apt.pot | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'po/python-apt.pot') diff --git a/po/python-apt.pot b/po/python-apt.pot index 0d683700..0fc2c959 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-12 09:45+0200\n" +"POT-Creation-Date: 2010-08-05 12:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -414,87 +413,87 @@ msgid "" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:79 +#: ../apt/debfile.py:81 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:164 +#: ../apt/debfile.py:166 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:185 +#: ../apt/debfile.py:187 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:323 +#: ../apt/debfile.py:326 #, python-format msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s " -"(%(deprelation)s %(depversion)s)" +"Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" +"s %(depversion)s)" msgstr "" #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation -#: ../apt/debfile.py:339 +#: ../apt/debfile.py:342 #, python-format msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " -"%(targetver)s)" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %" +"(targetver)s)" msgstr "" -#: ../apt/debfile.py:348 +#: ../apt/debfile.py:351 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -#: ../apt/debfile.py:394 +#: ../apt/debfile.py:397 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:399 +#: ../apt/debfile.py:402 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:406 +#: ../apt/debfile.py:409 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:431 +#: ../apt/debfile.py:434 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:461 +#: ../apt/debfile.py:464 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:503 ../apt/debfile.py:551 ../apt/debfile.py:562 +#: ../apt/debfile.py:506 ../apt/debfile.py:554 ../apt/debfile.py:565 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:535 +#: ../apt/debfile.py:538 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:541 +#: ../apt/debfile.py:544 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:638 +#: ../apt/debfile.py:641 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:648 +#: ../apt/debfile.py:651 msgid "An essential package would be removed" msgstr "" -- cgit v1.2.3