Merge lp:~nataliabidart/ubuntuone-control-panel/string-tweaks into lp:ubuntuone-control-panel

[Natalia Bidart]

  - 'your cloud' replcaed by 'your personal cloud' (LP: #715858).
  - devices panel title improved as per LP: #717230.
  - cloud folders tab tree view title improved as per LP: #717159.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'data/volumes.ui'
--- data/volumes.ui	2011-02-10 20:22:43 +0000
+++ data/volumes.ui	2011-02-11 20:34:31 +0000
@@ -38,7 +38,7 @@
             <property name="model">volumes_store</property>
             <property name="rules_hint">True</property>
             <property name="tooltip_column">0</property>
-            <signal name="row_activated" handler="on_volumes_view_row_activated"/>
+            <signal name="row-activated" handler="on_volumes_view_row_activated" swapped="no"/>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                 <property name="resizable">True</property>
@@ -67,7 +67,7 @@
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn3">
                 <property name="sizing">autosize</property>
-                <property name="title">On this device?</property>
+                <property name="title" translatable="yes">Sync locally?</property>
                 <child>
                   <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
                     <property name="indicator_size">15</property>

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-11 20:06:35 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-11 20:34:31 +0000
@@ -390,8 +390,8 @@
 class VolumesPanel(UbuntuOneBin, ControlPanelMixin):
     """The volumes panel."""
 
-    TITLE = _('Select the folders from your cloud that you want synchronized '
-              'in this device.')
+    TITLE = _('Select the folders from your personal cloud that you want '
+              'synchronized in this device.')
     MY_FOLDERS = _('My folders')
     ALWAYS_SUBSCRIBED = _('Always in sync!')
     FREE_SPACE = _('%(free_space)s available storage')
@@ -730,7 +730,8 @@
                                  gobject.TYPE_NONE, ()),
     }
 
-    TITLE = _('The devices synced with your personal cloud are listed below.')
+    TITLE = _('The devices connected with your personal cloud are listed '
+              'below.')
     NO_DEVICES = _('No devices to show.')
     CONFIRM_REMOVE = _('Are you sure you want to remove this device '
                        'from Ubuntu One?')