Software Properties

Merge lp:~amichai2/software-properties/fixes into lp:software-properties

  1. fixes
  2. Merge into main
Proposed by amichair
Status: Merged
Merged at revision: not available
Proposed branch: lp:~amichai2/software-properties/fixes
Merge into: lp:software-properties
Diff against target: 45 lines (+10/-5)
3 files modified
debian/changelog (+6/-0)
softwareproperties/kde/I18nHelper.py (+1/-1)
softwareproperties/kde/SoftwarePropertiesKDE.py (+3/-4)
To merge this branch: bzr merge lp:~amichai2/software-properties/fixes
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+22343@code.launchpad.net

Description of the change

Fixed another crash bug (bug #545927)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-26 13:18:23 +0000
+++ debian/changelog 2010-03-29 00:18:19 +0000
@@ -1,3 +1,9 @@
1software-properties (0.75.9) UNRELEASED; urgency=low
2
3 * [KDE] Fix crash caused by translations containing distro name (LP: #545927)
4
5 -- Amichai Rothman <amichai2@amichais.net> Mon, 29 Mar 2010 02:34:40 +0300
6
1software-properties (0.75.8) lucid; urgency=low7software-properties (0.75.8) lucid; urgency=low
28
3 [ Michael Vogt ]9 [ Michael Vogt ]
410
=== modified file 'softwareproperties/kde/I18nHelper.py'
--- softwareproperties/kde/I18nHelper.py 2010-02-20 10:40:57 +0000
+++ softwareproperties/kde/I18nHelper.py 2010-03-29 00:18:19 +0000
@@ -45,7 +45,7 @@
45 # assume latin1 as fallback45 # assume latin1 as fallback
46 return unicode(str, 'latin1')46 return unicode(str, 'latin1')
4747
48def _u(str):48def u_(str):
49 """ Translate a string and convert it to unicode using utf8 encoding """49 """ Translate a string and convert it to unicode using utf8 encoding """
50 return utf8(_(str))50 return utf8(_(str))
5151
5252
=== modified file 'softwareproperties/kde/SoftwarePropertiesKDE.py'
--- softwareproperties/kde/SoftwarePropertiesKDE.py 2009-12-13 21:07:30 +0000
+++ softwareproperties/kde/SoftwarePropertiesKDE.py 2010-03-29 00:18:19 +0000
@@ -206,12 +206,11 @@
206206
207 def init_distro(self):207 def init_distro(self):
208 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu208 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
209 text = _("%s updates") % self.distro.id209 text = u_("%s updates") % self.distro.id
210 text = text.replace("Ubuntu", "Kubuntu")210 text = text.replace("Ubuntu", "Kubuntu")
211 self.userinterface.groupBox_updates.setTitle(utf8(text))211 self.userinterface.groupBox_updates.setTitle(text)
212 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu212 # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
213 text = _("%s Software") % self.distro.id213 text = u_("%s Software") % self.distro.id
214 text = utf8(text)
215 text = text.replace("Ubuntu", "Kubuntu")214 text = text.replace("Ubuntu", "Kubuntu")
216 self.userinterface.tabWidget.setTabText(0, text)215 self.userinterface.tabWidget.setTabText(0, text)
217216

Subscribers

People subscribed via source and target branches

to status/vote changes: