Merge lp:~nataliabidart/ubuntuone-control-panel/fix-732820 into lp:ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 107
Merged at revision: 105
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/fix-732820
Merge into: lp:ubuntuone-control-panel
Diff against target: 749 lines (+329/-296)
3 files modified
data/install.ui (+13/-7)
data/services.ui (+312/-285)
ubuntuone/controlpanel/gtk/gui.py (+4/-4)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/fix-732820
Reviewer Review Type Date Requested Status
dobey (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+54269@code.launchpad.net

Commit message

- Replaced the AspectFrame for a plain Frame to fix the different width issue (LP: #729382).
- Changed the legend for plugin/extension installs (LP: #732820).

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

It looks like you've made the text into titles for the extensions. In that case, they should probably be "Firefox Extension" and "Evolution Plug-in" respectively. (Yes the hyphen should be there; it's proper English.)

Revision history for this message
Eric Casteleijn (thisfred) wrote :

Looks good to me now.

review: Approve
Revision history for this message
dobey (dobey) wrote :

OK, so I was wrong about the title case, but it should still be plug-in and not plugin.

107. By Natalia Bidart

Spelled "plu-ing".

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/install.ui'
2--- data/install.ui 2011-01-21 21:43:01 +0000
3+++ data/install.ui 2011-03-21 21:21:05 +0000
4@@ -2,34 +2,43 @@
5 <interface>
6 <requires lib="gtk+" version="2.22"/>
7 <!-- interface-naming-policy project-wide -->
8+ <object class="GtkImage" id="image1">
9+ <property name="visible">True</property>
10+ <property name="can_focus">False</property>
11+ <property name="stock">gtk-ok</property>
12+ </object>
13 <object class="GtkVBox" id="itself">
14 <property name="visible">True</property>
15+ <property name="can_focus">False</property>
16 <property name="border_width">10</property>
17 <property name="spacing">10</property>
18 <child>
19 <object class="GtkLabel" id="install_label">
20 <property name="visible">True</property>
21- <property name="xalign">0</property>
22+ <property name="can_focus">False</property>
23 <property name="label">label</property>
24 <property name="wrap">True</property>
25 </object>
26 <packing>
27- <property name="expand">False</property>
28+ <property name="expand">True</property>
29+ <property name="fill">True</property>
30 <property name="position">0</property>
31 </packing>
32 </child>
33 <child>
34 <object class="GtkHButtonBox" id="install_button_box">
35 <property name="visible">True</property>
36+ <property name="can_focus">False</property>
37 <child>
38 <object class="GtkButton" id="install_button">
39 <property name="label" translatable="yes">_Install now</property>
40 <property name="visible">True</property>
41 <property name="can_focus">True</property>
42 <property name="receives_default">True</property>
43+ <property name="use_action_appearance">False</property>
44 <property name="image">image1</property>
45 <property name="use_underline">True</property>
46- <signal name="clicked" handler="on_install_button_clicked"/>
47+ <signal name="clicked" handler="on_install_button_clicked" swapped="no"/>
48 </object>
49 <packing>
50 <property name="expand">False</property>
51@@ -40,12 +49,9 @@
52 </object>
53 <packing>
54 <property name="expand">False</property>
55+ <property name="fill">True</property>
56 <property name="position">1</property>
57 </packing>
58 </child>
59 </object>
60- <object class="GtkImage" id="image1">
61- <property name="visible">True</property>
62- <property name="stock">gtk-ok</property>
63- </object>
64 </interface>
65
66=== modified file 'data/services.ui'
67--- data/services.ui 2011-03-04 21:43:19 +0000
68+++ data/services.ui 2011-03-21 21:21:05 +0000
69@@ -18,336 +18,363 @@
70 <property name="resize_mode">queue</property>
71 <property name="shadow_type">none</property>
72 <child>
73- <object class="GtkVBox" id="vbox1">
74+ <object class="GtkAlignment" id="alignment1">
75 <property name="visible">True</property>
76 <property name="can_focus">False</property>
77- <property name="spacing">5</property>
78+ <property name="left_padding">5</property>
79+ <property name="right_padding">5</property>
80 <child>
81- <object class="GtkAspectFrame" id="files">
82+ <object class="GtkVBox" id="vbox1">
83 <property name="visible">True</property>
84 <property name="can_focus">False</property>
85- <property name="label_xalign">0</property>
86- <property name="shadow_type">out</property>
87+ <property name="spacing">5</property>
88 <child>
89- <object class="GtkHBox" id="hbox2">
90+ <object class="GtkFrame" id="files">
91 <property name="visible">True</property>
92 <property name="can_focus">False</property>
93- <property name="border_width">5</property>
94+ <property name="label_xalign">0</property>
95+ <property name="shadow_type">out</property>
96 <child>
97- <object class="GtkTable" id="table1">
98+ <object class="GtkAlignment" id="alignment2">
99 <property name="visible">True</property>
100 <property name="can_focus">False</property>
101- <property name="n_rows">3</property>
102- <property name="n_columns">3</property>
103- <property name="row_spacing">5</property>
104- <child>
105- <object class="GtkCheckButton" id="file_sync_check">
106- <property name="visible">True</property>
107- <property name="can_focus">True</property>
108- <property name="receives_default">False</property>
109- <property name="use_action_appearance">False</property>
110- <property name="draw_indicator">True</property>
111- </object>
112- </child>
113- <child>
114- <object class="GtkImage" id="image2">
115- <property name="visible">True</property>
116- <property name="can_focus">False</property>
117- <property name="xpad">5</property>
118- <property name="pixbuf">services-files.png</property>
119- </object>
120- <packing>
121- <property name="left_attach">1</property>
122- <property name="right_attach">2</property>
123- </packing>
124- </child>
125- <child>
126- <object class="GtkLabel" id="label1">
127- <property name="visible">True</property>
128- <property name="can_focus">False</property>
129- <property name="xalign">0</property>
130- <property name="label" translatable="yes">Enable File Sync</property>
131- </object>
132- <packing>
133- <property name="left_attach">2</property>
134- <property name="right_attach">3</property>
135- </packing>
136- </child>
137- <child>
138- <object class="GtkLabel" id="label2">
139- <property name="visible">True</property>
140- <property name="can_focus">False</property>
141- <property name="xalign">0</property>
142- <property name="yalign">0</property>
143- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One
144+ <child>
145+ <object class="GtkHBox" id="hbox2">
146+ <property name="visible">True</property>
147+ <property name="can_focus">False</property>
148+ <property name="border_width">5</property>
149+ <child>
150+ <object class="GtkTable" id="table1">
151+ <property name="visible">True</property>
152+ <property name="can_focus">False</property>
153+ <property name="n_rows">3</property>
154+ <property name="n_columns">3</property>
155+ <property name="column_spacing">5</property>
156+ <property name="row_spacing">5</property>
157+ <child>
158+ <object class="GtkCheckButton" id="file_sync_check">
159+ <property name="visible">True</property>
160+ <property name="can_focus">True</property>
161+ <property name="receives_default">False</property>
162+ <property name="use_action_appearance">False</property>
163+ <property name="draw_indicator">True</property>
164+ </object>
165+ </child>
166+ <child>
167+ <object class="GtkImage" id="image2">
168+ <property name="visible">True</property>
169+ <property name="can_focus">False</property>
170+ <property name="xpad">5</property>
171+ <property name="pixbuf">services-files.png</property>
172+ </object>
173+ <packing>
174+ <property name="left_attach">1</property>
175+ <property name="right_attach">2</property>
176+ </packing>
177+ </child>
178+ <child>
179+ <object class="GtkLabel" id="label1">
180+ <property name="visible">True</property>
181+ <property name="can_focus">False</property>
182+ <property name="xalign">0</property>
183+ <property name="label" translatable="yes">Enable File Sync</property>
184+ </object>
185+ <packing>
186+ <property name="left_attach">2</property>
187+ <property name="right_attach">3</property>
188+ </packing>
189+ </child>
190+ <child>
191+ <object class="GtkLabel" id="label2">
192+ <property name="visible">True</property>
193+ <property name="can_focus">False</property>
194+ <property name="xalign">0</property>
195+ <property name="yalign">0</property>
196+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One
197
198 Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>
199- <property name="use_markup">True</property>
200- <property name="wrap">True</property>
201- <property name="width_chars">30</property>
202- </object>
203- <packing>
204- <property name="left_attach">2</property>
205- <property name="right_attach">3</property>
206- <property name="top_attach">1</property>
207- <property name="bottom_attach">2</property>
208- </packing>
209- </child>
210- <child>
211- <object class="GtkHButtonBox" id="hbuttonbox1">
212- <property name="visible">True</property>
213- <property name="can_focus">False</property>
214+ <property name="use_markup">True</property>
215+ <property name="wrap">True</property>
216+ <property name="width_chars">35</property>
217+ </object>
218+ <packing>
219+ <property name="left_attach">2</property>
220+ <property name="right_attach">3</property>
221+ <property name="top_attach">1</property>
222+ <property name="bottom_attach">2</property>
223+ </packing>
224+ </child>
225+ <child>
226+ <object class="GtkHButtonBox" id="hbuttonbox1">
227+ <property name="visible">True</property>
228+ <property name="can_focus">False</property>
229+ <child>
230+ <object class="GtkButton" id="file_sync_button">
231+ <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
232+ <property name="visible">True</property>
233+ <property name="can_focus">True</property>
234+ <property name="receives_default">True</property>
235+ <property name="use_action_appearance">False</property>
236+ <property name="use_underline">True</property>
237+ <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
238+ </object>
239+ <packing>
240+ <property name="expand">False</property>
241+ <property name="fill">False</property>
242+ <property name="position">0</property>
243+ </packing>
244+ </child>
245+ </object>
246+ <packing>
247+ <property name="left_attach">2</property>
248+ <property name="right_attach">3</property>
249+ <property name="top_attach">2</property>
250+ <property name="bottom_attach">3</property>
251+ </packing>
252+ </child>
253+ <child>
254+ <placeholder/>
255+ </child>
256+ <child>
257+ <placeholder/>
258+ </child>
259+ <child>
260+ <placeholder/>
261+ </child>
262+ <child>
263+ <placeholder/>
264+ </child>
265+ </object>
266+ <packing>
267+ <property name="expand">False</property>
268+ <property name="fill">True</property>
269+ <property name="position">0</property>
270+ </packing>
271+ </child>
272 <child>
273- <object class="GtkButton" id="file_sync_button">
274- <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
275+ <object class="GtkImage" id="image1">
276 <property name="visible">True</property>
277- <property name="can_focus">True</property>
278- <property name="receives_default">True</property>
279- <property name="use_action_appearance">False</property>
280- <property name="use_underline">True</property>
281- <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
282+ <property name="can_focus">False</property>
283+ <property name="xpad">5</property>
284+ <property name="ypad">5</property>
285+ <property name="pixbuf">services-files-example.png</property>
286 </object>
287 <packing>
288 <property name="expand">False</property>
289- <property name="fill">False</property>
290- <property name="position">0</property>
291+ <property name="fill">True</property>
292+ <property name="pack_type">end</property>
293+ <property name="position">1</property>
294 </packing>
295 </child>
296 </object>
297- <packing>
298- <property name="left_attach">2</property>
299- <property name="right_attach">3</property>
300- <property name="top_attach">2</property>
301- <property name="bottom_attach">3</property>
302- </packing>
303- </child>
304- <child>
305- <placeholder/>
306- </child>
307- <child>
308- <placeholder/>
309- </child>
310- <child>
311- <placeholder/>
312- </child>
313- <child>
314- <placeholder/>
315 </child>
316 </object>
317- <packing>
318- <property name="expand">False</property>
319- <property name="fill">True</property>
320- <property name="position">0</property>
321- </packing>
322 </child>
323- <child>
324- <object class="GtkImage" id="image1">
325- <property name="visible">True</property>
326- <property name="can_focus">False</property>
327- <property name="xpad">5</property>
328- <property name="ypad">5</property>
329- <property name="pixbuf">services-files-example.png</property>
330- </object>
331- <packing>
332- <property name="expand">False</property>
333- <property name="fill">True</property>
334- <property name="pack_type">end</property>
335- <property name="position">1</property>
336- </packing>
337+ <child type="label_item">
338+ <placeholder/>
339 </child>
340 </object>
341+ <packing>
342+ <property name="expand">False</property>
343+ <property name="fill">True</property>
344+ <property name="position">0</property>
345+ </packing>
346 </child>
347- </object>
348- <packing>
349- <property name="expand">True</property>
350- <property name="fill">True</property>
351- <property name="position">0</property>
352- </packing>
353- </child>
354- <child>
355- <object class="GtkAspectFrame" id="replications">
356- <property name="visible">True</property>
357- <property name="can_focus">False</property>
358- <property name="label_xalign">0</property>
359- <property name="shadow_type">out</property>
360 <child>
361- <object class="GtkHBox" id="hbox3">
362+ <object class="GtkFrame" id="replications">
363 <property name="visible">True</property>
364 <property name="can_focus">False</property>
365- <property name="border_width">5</property>
366+ <property name="label_xalign">0</property>
367+ <property name="shadow_type">out</property>
368 <child>
369- <object class="GtkVBox" id="contacts">
370+ <object class="GtkAlignment" id="alignment3">
371 <property name="visible">True</property>
372 <property name="can_focus">False</property>
373 <child>
374- <object class="GtkTable" id="contacts_sync">
375+ <object class="GtkHBox" id="hbox3">
376 <property name="visible">True</property>
377 <property name="can_focus">False</property>
378- <property name="n_rows">2</property>
379- <property name="n_columns">3</property>
380- <property name="row_spacing">5</property>
381- <child>
382- <object class="GtkCheckButton" id="contacts_check">
383- <property name="visible">True</property>
384- <property name="can_focus">True</property>
385- <property name="receives_default">False</property>
386- <property name="use_action_appearance">False</property>
387- <property name="draw_indicator">True</property>
388- </object>
389- </child>
390- <child>
391- <object class="GtkImage" id="image3">
392- <property name="visible">True</property>
393- <property name="can_focus">False</property>
394- <property name="xpad">5</property>
395- <property name="pixbuf">services-contacts.png</property>
396- </object>
397- <packing>
398- <property name="left_attach">1</property>
399- <property name="right_attach">2</property>
400- </packing>
401- </child>
402- <child>
403- <object class="GtkLabel" id="label4">
404- <property name="visible">True</property>
405- <property name="can_focus">False</property>
406- <property name="xalign">0</property>
407- <property name="label" translatable="yes">Enable Contacts Sync</property>
408- </object>
409- <packing>
410- <property name="left_attach">2</property>
411- <property name="right_attach">3</property>
412- </packing>
413- </child>
414- <child>
415- <object class="GtkLabel" id="label5">
416- <property name="visible">True</property>
417- <property name="can_focus">True</property>
418- <property name="xalign">0</property>
419- <property name="yalign">0</property>
420- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
421- <property name="use_markup">True</property>
422- <property name="wrap">True</property>
423- <property name="width_chars">30</property>
424- </object>
425- <packing>
426- <property name="left_attach">2</property>
427- <property name="right_attach">3</property>
428- <property name="top_attach">1</property>
429- <property name="bottom_attach">2</property>
430- </packing>
431- </child>
432- <child>
433- <placeholder/>
434- </child>
435- <child>
436- <placeholder/>
437+ <property name="border_width">5</property>
438+ <child>
439+ <object class="GtkVBox" id="contacts">
440+ <property name="visible">True</property>
441+ <property name="can_focus">False</property>
442+ <child>
443+ <object class="GtkTable" id="contacts_sync">
444+ <property name="visible">True</property>
445+ <property name="can_focus">False</property>
446+ <property name="n_rows">2</property>
447+ <property name="n_columns">3</property>
448+ <property name="row_spacing">5</property>
449+ <child>
450+ <object class="GtkCheckButton" id="contacts_check">
451+ <property name="visible">True</property>
452+ <property name="can_focus">True</property>
453+ <property name="receives_default">False</property>
454+ <property name="use_action_appearance">False</property>
455+ <property name="draw_indicator">True</property>
456+ </object>
457+ </child>
458+ <child>
459+ <object class="GtkImage" id="image3">
460+ <property name="visible">True</property>
461+ <property name="can_focus">False</property>
462+ <property name="xpad">5</property>
463+ <property name="pixbuf">services-contacts.png</property>
464+ </object>
465+ <packing>
466+ <property name="left_attach">1</property>
467+ <property name="right_attach">2</property>
468+ </packing>
469+ </child>
470+ <child>
471+ <object class="GtkLabel" id="label4">
472+ <property name="visible">True</property>
473+ <property name="can_focus">False</property>
474+ <property name="xalign">0</property>
475+ <property name="label" translatable="yes">Enable Contacts Sync</property>
476+ </object>
477+ <packing>
478+ <property name="left_attach">2</property>
479+ <property name="right_attach">3</property>
480+ </packing>
481+ </child>
482+ <child>
483+ <object class="GtkLabel" id="label5">
484+ <property name="visible">True</property>
485+ <property name="can_focus">True</property>
486+ <property name="xalign">0</property>
487+ <property name="yalign">0</property>
488+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
489+ <property name="use_markup">True</property>
490+ <property name="wrap">True</property>
491+ <property name="width_chars">35</property>
492+ </object>
493+ <packing>
494+ <property name="left_attach">2</property>
495+ <property name="right_attach">3</property>
496+ <property name="top_attach">1</property>
497+ <property name="bottom_attach">2</property>
498+ </packing>
499+ </child>
500+ <child>
501+ <placeholder/>
502+ </child>
503+ <child>
504+ <placeholder/>
505+ </child>
506+ </object>
507+ <packing>
508+ <property name="expand">False</property>
509+ <property name="fill">True</property>
510+ <property name="position">0</property>
511+ </packing>
512+ </child>
513+ </object>
514+ <packing>
515+ <property name="expand">False</property>
516+ <property name="fill">True</property>
517+ <property name="position">0</property>
518+ </packing>
519+ </child>
520+ <child>
521+ <object class="GtkVBox" id="bookmarks">
522+ <property name="visible">True</property>
523+ <property name="can_focus">False</property>
524+ <child>
525+ <object class="GtkTable" id="bookmarks_sync">
526+ <property name="visible">True</property>
527+ <property name="can_focus">False</property>
528+ <property name="n_rows">2</property>
529+ <property name="n_columns">3</property>
530+ <property name="row_spacing">5</property>
531+ <child>
532+ <object class="GtkCheckButton" id="bookmarks_check">
533+ <property name="visible">True</property>
534+ <property name="can_focus">True</property>
535+ <property name="receives_default">False</property>
536+ <property name="use_action_appearance">False</property>
537+ <property name="draw_indicator">True</property>
538+ </object>
539+ </child>
540+ <child>
541+ <object class="GtkImage" id="image4">
542+ <property name="visible">True</property>
543+ <property name="can_focus">False</property>
544+ <property name="xpad">5</property>
545+ <property name="pixbuf">services-bookmarks.png</property>
546+ </object>
547+ <packing>
548+ <property name="left_attach">1</property>
549+ <property name="right_attach">2</property>
550+ </packing>
551+ </child>
552+ <child>
553+ <object class="GtkLabel" id="label6">
554+ <property name="visible">True</property>
555+ <property name="can_focus">False</property>
556+ <property name="xalign">0</property>
557+ <property name="label" translatable="yes">Enable Bookmarks Sync</property>
558+ </object>
559+ <packing>
560+ <property name="left_attach">2</property>
561+ <property name="right_attach">3</property>
562+ </packing>
563+ </child>
564+ <child>
565+ <object class="GtkLabel" id="label7">
566+ <property name="visible">True</property>
567+ <property name="can_focus">False</property>
568+ <property name="xalign">0</property>
569+ <property name="yalign">0</property>
570+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
571+ <property name="use_markup">True</property>
572+ <property name="wrap">True</property>
573+ <property name="width_chars">30</property>
574+ </object>
575+ <packing>
576+ <property name="left_attach">2</property>
577+ <property name="right_attach">3</property>
578+ <property name="top_attach">1</property>
579+ <property name="bottom_attach">2</property>
580+ </packing>
581+ </child>
582+ <child>
583+ <placeholder/>
584+ </child>
585+ <child>
586+ <placeholder/>
587+ </child>
588+ </object>
589+ <packing>
590+ <property name="expand">False</property>
591+ <property name="fill">True</property>
592+ <property name="position">0</property>
593+ </packing>
594+ </child>
595+ </object>
596+ <packing>
597+ <property name="expand">False</property>
598+ <property name="fill">True</property>
599+ <property name="pack_type">end</property>
600+ <property name="position">1</property>
601+ </packing>
602 </child>
603 </object>
604- <packing>
605- <property name="expand">False</property>
606- <property name="fill">True</property>
607- <property name="position">0</property>
608- </packing>
609 </child>
610 </object>
611- <packing>
612- <property name="expand">False</property>
613- <property name="fill">True</property>
614- <property name="position">0</property>
615- </packing>
616 </child>
617- <child>
618- <object class="GtkVBox" id="bookmarks">
619- <property name="visible">True</property>
620- <property name="can_focus">False</property>
621- <child>
622- <object class="GtkTable" id="bookmarks_sync">
623- <property name="visible">True</property>
624- <property name="can_focus">False</property>
625- <property name="n_rows">2</property>
626- <property name="n_columns">3</property>
627- <property name="row_spacing">5</property>
628- <child>
629- <object class="GtkCheckButton" id="bookmarks_check">
630- <property name="visible">True</property>
631- <property name="can_focus">True</property>
632- <property name="receives_default">False</property>
633- <property name="use_action_appearance">False</property>
634- <property name="draw_indicator">True</property>
635- </object>
636- </child>
637- <child>
638- <object class="GtkImage" id="image4">
639- <property name="visible">True</property>
640- <property name="can_focus">False</property>
641- <property name="xpad">5</property>
642- <property name="pixbuf">services-bookmarks.png</property>
643- </object>
644- <packing>
645- <property name="left_attach">1</property>
646- <property name="right_attach">2</property>
647- </packing>
648- </child>
649- <child>
650- <object class="GtkLabel" id="label6">
651- <property name="visible">True</property>
652- <property name="can_focus">False</property>
653- <property name="xalign">0</property>
654- <property name="label" translatable="yes">Enable Bookmarks Sync</property>
655- </object>
656- <packing>
657- <property name="left_attach">2</property>
658- <property name="right_attach">3</property>
659- </packing>
660- </child>
661- <child>
662- <object class="GtkLabel" id="label7">
663- <property name="visible">True</property>
664- <property name="can_focus">False</property>
665- <property name="xalign">0</property>
666- <property name="yalign">0</property>
667- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox. Once enabled, you will need to install a plugin&lt;/span&gt;</property>
668- <property name="use_markup">True</property>
669- <property name="wrap">True</property>
670- <property name="width_chars">30</property>
671- </object>
672- <packing>
673- <property name="left_attach">2</property>
674- <property name="right_attach">3</property>
675- <property name="top_attach">1</property>
676- <property name="bottom_attach">2</property>
677- </packing>
678- </child>
679- <child>
680- <placeholder/>
681- </child>
682- <child>
683- <placeholder/>
684- </child>
685- </object>
686- <packing>
687- <property name="expand">False</property>
688- <property name="fill">True</property>
689- <property name="position">0</property>
690- </packing>
691- </child>
692- </object>
693- <packing>
694- <property name="expand">False</property>
695- <property name="fill">True</property>
696- <property name="pack_type">end</property>
697- <property name="position">1</property>
698- </packing>
699+ <child type="label_item">
700+ <placeholder/>
701 </child>
702 </object>
703+ <packing>
704+ <property name="expand">False</property>
705+ <property name="fill">True</property>
706+ <property name="position">1</property>
707+ </packing>
708 </child>
709 </object>
710- <packing>
711- <property name="expand">True</property>
712- <property name="fill">True</property>
713- <property name="position">1</property>
714- </packing>
715 </child>
716 </object>
717 </child>
718
719=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
720--- ubuntuone/controlpanel/gtk/gui.py 2011-03-21 20:16:16 +0000
721+++ ubuntuone/controlpanel/gtk/gui.py 2011-03-21 21:21:05 +0000
722@@ -855,7 +855,7 @@
723
724 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
725 '</i> in order to enable more sync services.')
726- INSTALLING = _('installation of <i>%(package_name)s</i> in progress')
727+ INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
728 FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed')
729 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
730
731@@ -1024,7 +1024,7 @@
732 class DesktopcouchService(Service):
733 """A desktopcouch service."""
734
735- INSTALL_PACKAGE = _('Install <i>%(plugin_name)s</i> plugin '
736+ INSTALL_PACKAGE = _('Install the %(plugin_name)s '
737 'for %(service_name)s sync')
738
739 def __init__(self, service_id, name, enabled,
740@@ -1092,8 +1092,8 @@
741
742 TITLE = _('Enable the sync services for this computer.')
743 DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone'
744- BOOKMARKS = 'Firefox'
745- CONTACTS = 'Evolution'
746+ BOOKMARKS = _('Firefox extension')
747+ CONTACTS = _('Evolution plug-in')
748 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
749 CONTACTS_LINK = 'https://one.ubuntu.com/'
750

Subscribers

People subscribed via source and target branches