Ubuntu Software Center

Merge lp:~kelemeng/software-center/bug880757 into lp:software-center

  1. bug880757
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 2592
Proposed branch: lp:~kelemeng/software-center/bug880757
Merge into: lp:software-center
Diff against target: 34 lines (+5/-5)
1 file modified
softwarecenter/ui/gtk3/panes/installedpane.py (+5/-5)
To merge this branch: bzr merge lp:~kelemeng/software-center/bug880757
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+85266@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks! Merged into trunk now. I assume this should also go to 5.0, right?

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

Merged into 5.0 now as well, thanks again!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
2--- softwarecenter/ui/gtk3/panes/installedpane.py 2011-10-26 12:03:48 +0000
3+++ softwarecenter/ui/gtk3/panes/installedpane.py 2011-12-12 00:32:24 +0000
4@@ -154,7 +154,7 @@
5 oneconftoolbar.set_orientation(Gtk.Orientation.HORIZONTAL)
6 oneconfpropertymenu = Gtk.Menu()
7 self.oneconfproperty = MenuButton(oneconfpropertymenu, Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.BUTTON))
8- stop_oneconf_share_menuitem = Gtk.MenuItem(label=_("Stop Syncing “%s”") % platform.node())
9+ stop_oneconf_share_menuitem = Gtk.MenuItem(label=_(u"Stop Syncing “%s”") % platform.node())
10 stop_oneconf_share_menuitem.connect("activate", self._on_stop_showing_oneconf_clicked)
11 stop_oneconf_share_menuitem.show()
12 oneconfpropertymenu.append(stop_oneconf_share_menuitem)
13@@ -434,8 +434,8 @@
14 L = len(enq.matches)
15
16 if L:
17- cat_title = ngettext('%(amount)s item on “%(machine)s” not on this computer',
18- '%(amount)s items on “%(machine)s” not on this computer',
19+ cat_title = ngettext(u'%(amount)s item on “%(machine)s” not on this computer',
20+ u'%(amount)s items on “%(machine)s” not on this computer',
21 L) % { 'amount' : L, 'machine': self.current_hostname}
22 i += L
23 docs = enq.get_documents()
24@@ -456,8 +456,8 @@
25
26 L = len(enq.matches)
27 if L:
28- cat_title = ngettext('%(amount)s item on this computer not on “%(machine)s”',
29- '%(amount)s items on this computer not on “%(machine)s”',
30+ cat_title = ngettext(u'%(amount)s item on this computer not on “%(machine)s”',
31+ u'%(amount)s items on this computer not on “%(machine)s”',
32 L) % { 'amount' : L, 'machine': self.current_hostname}
33 i += L
34 docs = enq.get_documents()