Merge lp:~dobey/ubuntuone-installer/translate into lp:ubuntuone-installer

Proposed by dobey
Status: Merged
Approved by: Roberto Alsina
Approved revision: 14
Merged at revision: 19
Proposed branch: lp:~dobey/ubuntuone-installer/translate
Merge into: lp:ubuntuone-installer
Diff against target: 109 lines (+14/-9)
2 files modified
po/POTFILES.in (+1/-0)
ubuntuone/installer/gui.py (+13/-9)
To merge this branch: bzr merge lp:~dobey/ubuntuone-installer/translate
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+75408@code.launchpad.net

Commit message

Mark some strings for translation

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1 trivial

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2011-07-27 21:52:30 +0000
3+++ po/POTFILES.in 2011-09-14 19:22:33 +0000
4@@ -1,2 +1,3 @@
5 ubuntuone-installer.desktop.in
6+ubuntuone/installer/gui.py
7
8
9=== modified file 'ubuntuone/installer/gui.py'
10--- ubuntuone/installer/gui.py 2011-09-13 20:56:53 +0000
11+++ ubuntuone/installer/gui.py 2011-09-14 19:22:33 +0000
12@@ -17,6 +17,7 @@
13
14 import aptdaemon.gtk3widgets as aptgtk
15 import aptdaemon.client as aptclient
16+import gettext
17 import os
18
19 from gi.repository import Gtk, GObject, GLib, Gdk, Pango
20@@ -31,6 +32,9 @@
21 if inline_callbacks is None:
22 inline_callbacks = old_callbacks
23
24+gettext.textdomain('ubuntuone-installer')
25+_ = gettext.gettext
26+
27
28 class UnsupportedDistribution(BaseException):
29 """Exception for when on an unsupported distribution."""
30@@ -91,14 +95,14 @@
31 self.__hlabelbox.show()
32
33 self.__hlabel = Gtk.Label((u'<span size="xx-large">{}</span>').format(
34- u'Install Ubuntu One'))
35+ _(u'Install Ubuntu One')))
36 self.__hlabel.set_use_markup(True)
37 self.__hlabel.set_alignment(0.0, 0.0)
38 self.__hlabelbox.pack_start(self.__hlabel, False, False, 0)
39 self.__hlabel.show()
40
41 self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format(
42- u'Discover the freedom of your personal cloud'))
43+ _(u'Discover the freedom of your personal cloud')))
44 self.__hlabel2.set_use_markup(True)
45 self.__hlabel2.set_alignment(0.0, 0.0)
46 self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0)
47@@ -217,7 +221,7 @@
48 page.pack_start(table, True, True, 24)
49 table.show()
50
51- label = Gtk.Label(u'<big>{}</big>'.format(u'Sync'))
52+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Sync')))
53 label.set_use_markup(True)
54 table.attach_defaults(label, 0, 1, 0, 1)
55 label.show()
56@@ -233,7 +237,7 @@
57 width_chars = (image.get_pixbuf().get_width() / width) * 2.5
58
59 label = Gtk.Label(u'<small>{}</small>'.format(
60- (u'Sync files across your devices.')))
61+ _(u'Sync files across your devices.')))
62 label.set_max_width_chars(width_chars)
63 label.set_width_chars(width_chars)
64 label.set_use_markup(True)
65@@ -247,7 +251,7 @@
66 table.attach_defaults(separator, 1, 2, 0, 3)
67 separator.show()
68
69- label = Gtk.Label(u'<big>{}</big>'.format(u'Stream'))
70+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Stream')))
71 label.set_use_markup(True)
72 table.attach_defaults(label, 2, 3, 0, 1)
73 label.show()
74@@ -260,7 +264,7 @@
75 image.set_from_file(path)
76
77 label = Gtk.Label(u'<small>{}</small>'.format(
78- (u'Stream your music on the move and offline.')))
79+ _(u'Stream your music on the move and offline.')))
80 label.set_max_width_chars(width_chars)
81 label.set_width_chars(width_chars)
82 label.set_use_markup(True)
83@@ -274,7 +278,7 @@
84 table.attach_defaults(separator, 3, 4, 0, 3)
85 separator.show()
86
87- label = Gtk.Label(u'<big>{}</big>'.format(u'Share'))
88+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Share')))
89 label.set_use_markup(True)
90 table.attach_defaults(label, 4, 5, 0, 1)
91 label.show()
92@@ -287,7 +291,7 @@
93 image.set_from_file(path)
94
95 label = Gtk.Label(u'<small>{}</small>'.format(
96- (u'Share with colleagues, friends, and family.')))
97+ _(u'Share with colleagues, friends, and family.')))
98 label.set_max_width_chars(width_chars)
99 label.set_width_chars(width_chars)
100 label.set_use_markup(True)
101@@ -306,7 +310,7 @@
102 page.set_spacing(6)
103 page.show()
104
105- label = Gtk.Label(u'Ubuntu One is installing…')
106+ label = Gtk.Label(_(u'Ubuntu One is installing…'))
107 label.set_alignment(0.0, 0.0)
108 page.pack_start(label, False, True, 0)
109 label.show()

Subscribers

People subscribed via source and target branches

to all changes: