Merge lp:~chipaca/ubuntuone-client/add-instructional-text into lp:ubuntuone-client

[John Lenton]

add instructional text to devices and services tabs

Oooh, look, instructional texts!

[John O'Brien (jdobrien)]

Looks good. I am wondering if the following text really makes it clear.

"Selecting additional synchronizing features contributes to data stored with Ubuntu One"

Is this a warning that I am going to use up may space, and invitation to use more, or is this just a way of controlling what is synced with Ubuntu One.

[Facundo Batista (facundo)]

Works.

review: Approve

[lp:~chipaca/ubuntuone-client/add-instructional-text]

455. By John Lenton on 2010-03-29

changes to the text as per mattgriffin

[Guillermo Gonzalez (verterok)]

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-03-26 19:36:48 +0000
+++ bin/ubuntuone-preferences	2010-03-29 19:02:25 +0000
@@ -181,9 +181,8 @@
         self.status_label = gtk.Label("")
         self.attach(self.status_label, 0, 3, 2, 3)
 
-        self.description = gtk.Label(_("The devices connected to with your"
-                                       " personal cloud network"
-                                       " are listed below"))
+        self.description = gtk.Label(_("The following devices synchronize"
+                                       " with your Ubuntu One account."))
         self.description.set_alignment(0., .5)
         self.description.set_line_wrap(True)
         self.attach(self.description, 0, 3, 0, 1, xpadding=12, ypadding=12)
@@ -781,6 +780,17 @@
         self.notebook.set_tab_label_text(services, _("Services"))
         services.show()
 
+        label = gtk.Label()
+        label.set_markup(
+            _("Ubuntu One sync options\n"
+              "<small>Choose services to synchronize"
+              " with this computer</small>"))
+        label.set_alignment(0., .5)
+        label.set_padding(12, 6)
+        label.set_line_wrap(True)
+        services.pack_start(label, False, False)
+        label.show()
+
         self.bookmarks_check = gtk.CheckButton(_("_Bookmarks"))
         self.bookmarks_check.set_data('dbname', 'bookmarks')
         self.bookmarks_check.connect('toggled', self.__db_check_toggled)