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
=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
--- softwarecenter/ui/gtk3/panes/installedpane.py 2011-10-26 12:03:48 +0000
+++ softwarecenter/ui/gtk3/panes/installedpane.py 2011-12-12 00:32:24 +0000
@@ -154,7 +154,7 @@
154 oneconftoolbar.set_orientation(Gtk.Orientation.HORIZONTAL)154 oneconftoolbar.set_orientation(Gtk.Orientation.HORIZONTAL)
155 oneconfpropertymenu = Gtk.Menu()155 oneconfpropertymenu = Gtk.Menu()
156 self.oneconfproperty = MenuButton(oneconfpropertymenu, Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.BUTTON))156 self.oneconfproperty = MenuButton(oneconfpropertymenu, Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.BUTTON))
157 stop_oneconf_share_menuitem = Gtk.MenuItem(label=_("Stop Syncing “%s”") % platform.node())157 stop_oneconf_share_menuitem = Gtk.MenuItem(label=_(u"Stop Syncing “%s”") % platform.node())
158 stop_oneconf_share_menuitem.connect("activate", self._on_stop_showing_oneconf_clicked)158 stop_oneconf_share_menuitem.connect("activate", self._on_stop_showing_oneconf_clicked)
159 stop_oneconf_share_menuitem.show()159 stop_oneconf_share_menuitem.show()
160 oneconfpropertymenu.append(stop_oneconf_share_menuitem)160 oneconfpropertymenu.append(stop_oneconf_share_menuitem)
@@ -434,8 +434,8 @@
434 L = len(enq.matches)434 L = len(enq.matches)
435435
436 if L:436 if L:
437 cat_title = ngettext('%(amount)s item on “%(machine)s” not on this computer',437 cat_title = ngettext(u'%(amount)s item on “%(machine)s” not on this computer',
438 '%(amount)s items on “%(machine)s” not on this computer',438 u'%(amount)s items on “%(machine)s” not on this computer',
439 L) % { 'amount' : L, 'machine': self.current_hostname}439 L) % { 'amount' : L, 'machine': self.current_hostname}
440 i += L440 i += L
441 docs = enq.get_documents()441 docs = enq.get_documents()
@@ -456,8 +456,8 @@
456456
457 L = len(enq.matches)457 L = len(enq.matches)
458 if L:458 if L:
459 cat_title = ngettext('%(amount)s item on this computer not on “%(machine)s”',459 cat_title = ngettext(u'%(amount)s item on this computer not on “%(machine)s”',
460 '%(amount)s items on this computer not on “%(machine)s”',460 u'%(amount)s items on this computer not on “%(machine)s”',
461 L) % { 'amount' : L, 'machine': self.current_hostname}461 L) % { 'amount' : L, 'machine': self.current_hostname}
462 i += L462 i += L
463 docs = enq.get_documents()463 docs = enq.get_documents()