diff -Nru gdebi-0.6.0ubuntu1/GDebi/DebPackage.py gdebi-0.6.0ubuntu2/GDebi/DebPackage.py --- gdebi-0.6.0ubuntu1/GDebi/DebPackage.py 2010-04-06 13:13:15.000000000 +0100 +++ gdebi-0.6.0ubuntu2/GDebi/DebPackage.py 2010-06-14 15:32:26.000000000 +0100 @@ -276,7 +276,7 @@ if not apt_pkg.CheckDep(debver,dep.relation,dep.version): self._dbg(2, "would break (depends) %s" % pkg.name) # 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 - self._failureString += _("Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %i(depversion)s)") % { + self._failureString += _("Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %(depversion)s)") % { 'pkgname' : pkg.name, 'depname' : dep.name, 'deprelation' : dep.relation, diff -Nru gdebi-0.6.0ubuntu1/debian/changelog gdebi-0.6.0ubuntu2/debian/changelog --- gdebi-0.6.0ubuntu1/debian/changelog 2010-04-06 13:13:15.000000000 +0100 +++ gdebi-0.6.0ubuntu2/debian/changelog 2010-06-14 15:32:08.000000000 +0100 @@ -1,3 +1,10 @@ +gdebi (0.6.0ubuntu2) lucid; urgency=low + + * Fixed broken dependency status printing + (Closes: #537228) + + -- Daniel J Blueman Mon, 14 Jun 2010 15:31:22 +0100 + gdebi (0.6.0ubuntu1) lucid; urgency=low * cherry pick r309 from lp:~gdebi-developers/gdebi/trunk to diff -Nru gdebi-0.6.0ubuntu1/po/bn.po gdebi-0.6.0ubuntu2/po/bn.po --- gdebi-0.6.0ubuntu1/po/bn.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/bn.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-06 09:57+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -399,9 +399,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/ca.po gdebi-0.6.0ubuntu2/po/ca.po --- gdebi-0.6.0ubuntu1/po/ca.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/ca.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-03-27 21:18+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Catalan \n" @@ -415,9 +415,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/cs.po gdebi-0.6.0ubuntu2/po/cs.po --- gdebi-0.6.0ubuntu1/po/cs.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/cs.po 2010-06-14 15:32:38.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2008-03-20 14:30+0100\n" "Last-Translator: Kamil Páral \n" "Language-Team: Czech \n" @@ -411,9 +411,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/da.po gdebi-0.6.0ubuntu2/po/da.po --- gdebi-0.6.0ubuntu1/po/da.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/da.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2009-01-19 21:58+0000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -416,9 +416,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/de.po gdebi-0.6.0ubuntu2/po/de.po --- gdebi-0.6.0ubuntu1/po/de.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/de.po 2010-06-14 15:32:38.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: gdebi 0.1.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-14 18:00+0000\n" "Last-Translator: Sebastian Renner \n" "Language-Team: German \n" @@ -417,9 +417,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/es.po gdebi-0.6.0ubuntu2/po/es.po --- gdebi-0.6.0ubuntu1/po/es.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/es.po 2010-06-14 15:32:38.000000000 +0100 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: gdebi 0.5.9\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2009-11-08 03:43+0100\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -442,10 +442,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 -#, fuzzy +#, fuzzy, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"s %(depversion)s)" msgstr "El paquete «%s» se rompe por la dependencia «%s» (%s %s)\n" #. 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 diff -Nru gdebi-0.6.0ubuntu1/po/fi.po gdebi-0.6.0ubuntu2/po/fi.po --- gdebi-0.6.0ubuntu1/po/fi.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/fi.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2007-03-12 23:38+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -412,9 +412,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/fr.po gdebi-0.6.0ubuntu2/po/fr.po --- gdebi-0.6.0ubuntu1/po/fr.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/fr.po 2010-06-14 15:32:38.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-16 22:21+0000\n" "Last-Translator: Benoît Turpin \n" "Language-Team: French \n" @@ -416,9 +416,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/gdebi.pot gdebi-0.6.0ubuntu2/po/gdebi.pot --- gdebi-0.6.0ubuntu1/po/gdebi.pot 2010-04-06 13:13:16.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/gdebi.pot 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -393,9 +393,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/hr.po gdebi-0.6.0ubuntu2/po/hr.po --- gdebi-0.6.0ubuntu1/po/hr.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/hr.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-14 06:11+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -412,9 +412,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/hu.po gdebi-0.6.0ubuntu2/po/hu.po --- gdebi-0.6.0ubuntu1/po/hu.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/hu.po 2010-06-14 15:32:38.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-11 20:19+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -414,9 +414,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/id.po gdebi-0.6.0ubuntu2/po/id.po --- gdebi-0.6.0ubuntu1/po/id.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/id.po 2010-06-14 15:32:38.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-16 08:00+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -411,9 +411,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/it.po gdebi-0.6.0ubuntu2/po/it.po --- gdebi-0.6.0ubuntu1/po/it.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/it.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-08 15:32+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -414,9 +414,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/ko.po gdebi-0.6.0ubuntu2/po/ko.po --- gdebi-0.6.0ubuntu1/po/ko.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/ko.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-09 13:25+0000\n" "Last-Translator: atie \n" "Language-Team: Korean \n" @@ -410,9 +410,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/ku.po gdebi-0.6.0ubuntu2/po/ku.po --- gdebi-0.6.0ubuntu1/po/ku.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/ku.po 2010-06-14 15:32:38.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-13 13:45+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -399,9 +399,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/nl.po gdebi-0.6.0ubuntu2/po/nl.po --- gdebi-0.6.0ubuntu1/po/nl.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/nl.po 2010-06-14 15:32:39.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-11 19:00+0000\n" "Last-Translator: Jan Claeys \n" "Language-Team: Dutch \n" @@ -414,9 +414,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/pl.po gdebi-0.6.0ubuntu2/po/pl.po --- gdebi-0.6.0ubuntu1/po/pl.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/pl.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-18 19:26+0000\n" "Last-Translator: Zygmunt Krynicki \n" "Language-Team: Polish \n" @@ -413,9 +413,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/pt.po gdebi-0.6.0ubuntu2/po/pt.po --- gdebi-0.6.0ubuntu1/po/pt.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/pt.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-14 13:16+0000\n" "Last-Translator: Rui Az. \n" "Language-Team: Portuguese \n" @@ -412,9 +412,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/pt_BR.po gdebi-0.6.0ubuntu2/po/pt_BR.po --- gdebi-0.6.0ubuntu1/po/pt_BR.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/pt_BR.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-10 16:51+0000\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: Portuguese (Brazil) \n" @@ -410,9 +410,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/ru.po gdebi-0.6.0ubuntu2/po/ru.po --- gdebi-0.6.0ubuntu1/po/ru.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/ru.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-17 03:25+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -412,9 +412,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/sk.po gdebi-0.6.0ubuntu2/po/sk.po --- gdebi-0.6.0ubuntu1/po/sk.po 2010-04-06 13:13:17.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/sk.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-05-16 21:08+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -412,9 +412,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/sr.po gdebi-0.6.0ubuntu2/po/sr.po --- gdebi-0.6.0ubuntu1/po/sr.po 2010-04-06 13:13:18.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/sr.po 2010-06-14 15:32:39.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-29 17:23+0000\n" "Last-Translator: Jovan Turanjanin \n" "Language-Team: Serbian \n" @@ -395,9 +395,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/sv.po gdebi-0.6.0ubuntu2/po/sv.po --- gdebi-0.6.0ubuntu1/po/sv.po 2010-04-06 13:13:18.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/sv.po 2010-06-14 15:32:39.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi 0.1.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2006-04-23 13:00+0000\n" "Last-Translator: Christian Bjälevik \n" "Language-Team: Swedish \n" @@ -409,9 +409,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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 diff -Nru gdebi-0.6.0ubuntu1/po/tr.po gdebi-0.6.0ubuntu2/po/tr.po --- gdebi-0.6.0ubuntu1/po/tr.po 2010-04-06 13:13:18.000000000 +0100 +++ gdebi-0.6.0ubuntu2/po/tr.po 2010-06-14 15:32:39.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gdebi\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2010-04-06 14:13+0200\n" +"POT-Creation-Date: 2010-06-14 15:32+0100\n" "PO-Revision-Date: 2008-07-10 19:01+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Turkish \n" @@ -416,9 +416,10 @@ #. 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 #: ../GDebi/DebPackage.py:279 +#, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %i(depversion)s)" +"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