Merge lp:~dylanmccall/ubuntu/lucid/gdebi/bug-591470 into lp:ubuntu/lucid/gdebi

[Dylan McCall]

This is for bug #591470, changing a format string so that it won't crash gedit in some cases. More details in the bug report :)

[Sebastien Bacher (seb128)]

Could somebody mark this one as merged, the bug has been updated now

[Michael Vogt (mvo)]

This is merged and uploaded

review: Approve

=== modified file 'GDebi/DebPackage.py'
--- GDebi/DebPackage.py	2010-03-09 10:15:03 +0000
+++ GDebi/DebPackage.py	2010-07-26 17:31:19 +0000
@@ -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, 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-04-06 14:10:35 +0000
+++ debian/changelog	2010-07-26 17:31:19 +0000
@@ -1,3 +1,10 @@
+gdebi (0.6.0ubuntu2) UNRELEASED; urgency=low
+
+  * cherry pick r314 from lp:~gdebi-developers/gdebi/trunk to
+    fix format string crash (LP: #591470)
+
+ -- Dylan McCall <[e-mail]>  Fri, 16 Jul 2010 15:17:52 -0700
+
 gdebi (0.6.0ubuntu1) lucid; urgency=low
 
   * cherry pick r309 from lp:~gdebi-developers/gdebi/trunk to
 
=== modified file 'po/bn.po'
--- po/bn.po	2010-04-06 14:10:35 +0000
+++ po/bn.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-06 09:57+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <[e-mail]>\n"
 "Language-Team: Bengali <[e-mail]>\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
 
=== modified file 'po/ca.po'
--- po/ca.po	2010-04-06 14:10:35 +0000
+++ po/ca.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-03-27 21:18+0000\n"
 "Last-Translator: Rosetta Administrators <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\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
 
=== modified file 'po/cs.po'
--- po/cs.po	2010-04-06 14:10:35 +0000
+++ po/cs.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2008-03-20 14:30+0100\n"
 "Last-Translator: Kamil Páral <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\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
 
=== modified file 'po/da.po'
--- po/da.po	2010-04-06 14:10:35 +0000
+++ po/da.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2009-01-19 21:58+0000\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\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
 
=== modified file 'po/de.po'
--- po/de.po	2010-04-06 14:10:35 +0000
+++ po/de.po	2010-07-26 17:31:19 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: gdebi 0.1.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-14 18:00+0000\n"
 "Last-Translator: Sebastian Renner <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\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
 
=== modified file 'po/es.po'
--- po/es.po	2010-04-06 14:10:35 +0000
+++ po/es.po	2010-07-26 17:31:19 +0000
@@ -31,7 +31,7 @@
 msgstr ""
 "Project-Id-Version: gdebi 0.5.9\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2009-11-08 03:43+0100\n"
 "Last-Translator: Omar Campagne <[e-mail]>\n"
 "Language-Team: Debian l10n Spanish <[e-mail]>\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
 
=== modified file 'po/fi.po'
--- po/fi.po	2010-04-06 14:10:35 +0000
+++ po/fi.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2007-03-12 23:38+0200\n"
 "Last-Translator: Timo Jyrinki <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\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
 
=== modified file 'po/fr.po'
--- po/fr.po	2010-04-06 14:10:35 +0000
+++ po/fr.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-16 22:21+0000\n"
 "Last-Translator: Benoît Turpin <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\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
 
=== modified file 'po/gdebi.pot'
--- po/gdebi.pot	2010-04-06 14:10:35 +0000
+++ po/gdebi.pot	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\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
 
=== modified file 'po/hr.po'
--- po/hr.po	2010-04-06 14:10:35 +0000
+++ po/hr.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-14 06:11+0000\n"
 "Last-Translator: Ante Karamatić <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\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
 
=== modified file 'po/hu.po'
--- po/hu.po	2010-04-06 14:10:35 +0000
+++ po/hu.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-11 20:19+0000\n"
 "Last-Translator: Gabor Kelemen <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\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
 
=== modified file 'po/id.po'
--- po/id.po	2010-04-06 14:10:35 +0000
+++ po/id.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-16 08:00+0000\n"
 "Last-Translator: Andy Apdhani <[e-mail]>\n"
 "Language-Team: Indonesian <[e-mail]>\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
 
=== modified file 'po/it.po'
--- po/it.po	2010-04-06 14:10:35 +0000
+++ po/it.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-08 15:32+0000\n"
 "Last-Translator: Luca Ferretti <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\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
 
=== modified file 'po/ko.po'
--- po/ko.po	2010-04-06 14:10:35 +0000
+++ po/ko.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-09 13:25+0000\n"
 "Last-Translator: atie <[e-mail]>\n"
 "Language-Team: Korean <[e-mail]>\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
 
=== modified file 'po/ku.po'
--- po/ku.po	2010-04-06 14:10:35 +0000
+++ po/ku.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-13 13:45+0000\n"
 "Last-Translator: Erdal Ronahi <[e-mail]>\n"
 "Language-Team: Kurdish <[e-mail]>\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
 
=== modified file 'po/nl.po'
--- po/nl.po	2010-04-06 14:10:35 +0000
+++ po/nl.po	2010-07-26 17:31:19 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-11 19:00+0000\n"
 "Last-Translator: Jan Claeys <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\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
 
=== modified file 'po/pl.po'
--- po/pl.po	2010-04-06 14:10:35 +0000
+++ po/pl.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-18 19:26+0000\n"
 "Last-Translator: Zygmunt Krynicki <[e-mail]>\n"
 "Language-Team: Polish <[e-mail]>\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
 
=== modified file 'po/pt.po'
--- po/pt.po	2010-04-06 14:10:35 +0000
+++ po/pt.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-14 13:16+0000\n"
 "Last-Translator: Rui Az. <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\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
 
=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2010-04-06 14:10:35 +0000
+++ po/pt_BR.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-10 16:51+0000\n"
 "Last-Translator: Fábio Nogueira <[e-mail]>\n"
 "Language-Team: Portuguese (Brazil) <[e-mail]>\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
 
=== modified file 'po/ru.po'
--- po/ru.po	2010-04-06 14:10:35 +0000
+++ po/ru.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-17 03:25+0000\n"
 "Last-Translator: Igor Zubarev <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\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
 
=== modified file 'po/sk.po'
--- po/sk.po	2010-04-06 14:10:35 +0000
+++ po/sk.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-05-16 21:08+0000\n"
 "Last-Translator: Peter Chabada <[e-mail]>\n"
 "Language-Team: Slovak <[e-mail]>\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
 
=== modified file 'po/sr.po'
--- po/sr.po	2010-04-06 14:10:35 +0000
+++ po/sr.po	2010-07-26 17:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-29 17:23+0000\n"
 "Last-Translator: Jovan Turanjanin <[e-mail]>\n"
 "Language-Team: Serbian <[e-mail]>\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
 
=== modified file 'po/sv.po'
--- po/sv.po	2010-04-06 14:10:35 +0000
+++ po/sv.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi 0.1.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2006-04-23 13:00+0000\n"
 "Last-Translator: Christian Bjälevik <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\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
 
=== modified file 'po/tr.po'
--- po/tr.po	2010-04-06 14:10:35 +0000
+++ po/tr.po	2010-07-26 17:31:19 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gdebi\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-04-06 14:13+0200\n"
+"POT-Creation-Date: 2010-07-16 16:03-0700\n"
 "PO-Revision-Date: 2008-07-10 19:01+0200\n"
 "Last-Translator: Mert Dirik <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\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