Ubuntu Software Center

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

  1. bug875306
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 2538
Proposed branch: lp:~kelemeng/software-center/bug875306
Merge into: lp:software-center
Diff against target: 36 lines (+5/-0)
2 files modified
softwarecenter/ui/gtk3/views/appdetailsview_gtk.py (+2/-0)
softwarecenter/ui/gtk3/widgets/buttons.py (+3/-0)
To merge this branch: bzr merge lp:~kelemeng/software-center/bug875306
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+80962@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for adding a clarification for this!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview_gtk.py'
2--- softwarecenter/ui/gtk3/views/appdetailsview_gtk.py 2011-10-20 16:08:23 +0000
3+++ softwarecenter/ui/gtk3/views/appdetailsview_gtk.py 2011-11-01 23:08:24 +0000
4@@ -272,6 +272,7 @@
5 if app_details.price:
6 self.set_label(app_details.price)
7 else:
8+ # TRANSLATORS: Free here means Gratis
9 self.set_label(_("Free"))
10 self.set_button_label(_('Install'))
11 elif state == PkgStates.UPGRADABLE:
12@@ -533,6 +534,7 @@
13
14 self.applying = False
15
16+ # TRANSLATORS: Free here means Gratis
17 self.label_price = Gtk.Label(_("Free"))
18 self.hbox.pack_start(self.label_price, False, False, 0)
19
20
21=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
22--- softwarecenter/ui/gtk3/widgets/buttons.py 2011-10-11 14:14:23 +0000
23+++ softwarecenter/ui/gtk3/widgets/buttons.py 2011-11-01 23:08:24 +0000
24@@ -243,9 +243,12 @@
25 req_width)
26
27 details = AppDetails(db=helper.db, doc=doc)
28+ # TRANSLATORS: Free here means Gratis
29 price = details.price or _("Free")
30 if price == '0.00':
31+ # TRANSLATORS: Free here means Gratis
32 price = _("Free")
33+ # TRANSLATORS: Free here means Gratis
34 if price != _("Free"):
35 price = 'US$ ' + price
36 self.price = Gtk.Label.new(