Merge lp:~nataliabidart/ubuntuone-control-panel/all-ui-from-code into lp:ubuntuone-control-panel

[Natalia Bidart]

- No more strings coming up from the Designer ui files (LP: #938626).

[Manuel de la Peña (mandel)]

Tedious work that had to be done [phone]

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/all-ui-from-code]

268. By Natalia Bidart on 2012-02-22

Added disclaimer for hacks when accessing self.ui attrs.

=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2011-09-06 13:43:25 +0000
+++ data/qt/account.ui	2012-02-22 17:08:18 +0000
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
@@ -25,14 +25,14 @@
      <item row="0" column="2">
       <widget class="GoToWebButton" name="edit_profile_button">
        <property name="text">
-        <string>Edit personal details online</string>
+        <string notr="true">Edit personal details online</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QGroupBox" name="services">
        <property name="title">
-        <string>Your services</string>
+        <string notr="true">Your services</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <property name="leftMargin">
@@ -67,7 +67,7 @@
      <item row="0" column="0">
       <widget class="QGroupBox" name="profile_info">
        <property name="title">
-        <string>Personal details</string>
+        <string notr="true">Personal details</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <property name="leftMargin">
@@ -109,7 +109,7 @@
      <item row="2" column="2">
       <widget class="GoToWebButton" name="edit_services_button">
        <property name="text">
-        <string>Edit your services  online</string>
+        <string notr="true">Edit your services online</string>
        </property>
       </widget>
      </item>
 
=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-09-09 17:16:20 +0000
+++ data/qt/controlpanel.ui	2012-02-22 17:08:18 +0000
@@ -160,7 +160,7 @@
                <item>
                 <widget class="GoToWebButton" name="get_more_space_button">
                  <property name="text">
-                  <string>Get more storage</string>
+                  <string notr="true">Get more storage</string>
                  </property>
                 </widget>
                </item>
@@ -235,22 +235,22 @@
            </property>
            <widget class="FoldersPanel" name="folders_tab">
             <attribute name="title">
-             <string>Folders</string>
+             <string notr="true">Folders</string>
             </attribute>
            </widget>
            <widget class="DevicesPanel" name="devices_tab">
             <attribute name="title">
-             <string>Devices</string>
+             <string notr="true">Devices</string>
             </attribute>
            </widget>
            <widget class="PreferencesPanel" name="preferences_tab">
             <attribute name="title">
-             <string>Settings</string>
+             <string notr="true">Settings</string>
             </attribute>
            </widget>
            <widget class="AccountPanel" name="account_tab">
             <attribute name="title">
-             <string>Account information</string>
+             <string notr="true">Account information</string>
             </attribute>
            </widget>
           </widget>
@@ -287,7 +287,7 @@
       <item>
        <widget class="GoToWebButton" name="help_button">
         <property name="text">
-         <string>Get help online</string>
+         <string notr="true">Get help online</string>
         </property>
        </widget>
       </item>
@@ -312,7 +312,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Talk to us</string>
+         <string notr="true">Talk to us</string>
         </property>
        </widget>
       </item>
 
=== modified file 'data/qt/device.ui'
--- data/qt/device.ui	2011-08-23 16:03:31 +0000
+++ data/qt/device.ui	2012-02-22 17:08:18 +0000
@@ -24,7 +24,7 @@
    <item>
     <widget class="QLabel" name="device_name_label">
      <property name="text">
-      <string>Local device</string>
+      <string notr="true">Local device</string>
      </property>
     </widget>
    </item>
@@ -44,7 +44,7 @@
    <item>
     <widget class="QPushButton" name="remove_device_button">
      <property name="text">
-      <string>Remove</string>
+      <string notr="true">Remove</string>
      </property>
      <property name="secondary" stdset="0">
       <bool>true</bool>
 
=== modified file 'data/qt/device_remote.ui'
--- data/qt/device_remote.ui	2011-11-28 15:06:18 +0000
+++ data/qt/device_remote.ui	2012-02-22 17:08:18 +0000
@@ -24,7 +24,7 @@
    <item>
     <widget class="QLabel" name="device_name_label">
      <property name="text">
-      <string>Local device</string>
+      <string notr="true">Non local device</string>
      </property>
     </widget>
    </item>
 
=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2011-08-05 18:07:09 +0000
+++ data/qt/devices.ui	2012-02-22 17:08:18 +0000
@@ -23,7 +23,7 @@
    <item>
     <widget class="QGroupBox" name="local_device">
      <property name="title">
-      <string>This device</string>
+      <string notr="true">This device</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="margin">
@@ -36,9 +36,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="oher_devices">
+    <widget class="QGroupBox" name="other_devices">
      <property name="title">
-      <string>Other devices</string>
+      <string notr="true">Other devices</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">
@@ -90,7 +90,7 @@
      <item>
       <widget class="GoToWebButton" name="manage_devices_button">
        <property name="text">
-        <string>Go to the web page to manage your other devices</string>
+        <string notr="true">Go to the web page to manage your other devices</string>
        </property>
       </widget>
      </item>
 
=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-08-23 16:03:31 +0000
+++ data/qt/folders.ui	2012-02-22 17:08:18 +0000
@@ -41,7 +41,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>Go to the web for public and private sharing options</string>
+         <string notr="true">Go to the web for public and private sharing options</string>
         </property>
        </widget>
       </item>
@@ -101,17 +101,17 @@
      </attribute>
      <column>
       <property name="text">
-       <string>Name</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Sync Locally?</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Explore</string>
+       <string notr="true">Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string notr="true">Sync Locally?</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string notr="true">Explore</string>
       </property>
      </column>
     </widget>
@@ -153,7 +153,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>Add a folder from this computer</string>
+         <string notr="true">Add a folder from this computer</string>
         </property>
        </widget>
       </item>
 
=== modified file 'data/qt/loadingoverlay.ui'
--- data/qt/loadingoverlay.ui	2011-08-05 15:19:12 +0000
+++ data/qt/loadingoverlay.ui	2012-02-22 17:08:18 +0000
@@ -10,9 +10,6 @@
     <height>230</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Frame</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="topMargin">
     <number>30</number>
@@ -61,7 +58,7 @@
            </font>
           </property>
           <property name="text">
-           <string>Getting information, please wait...</string>
+           <string notr="true">Getting information, please wait...</string>
           </property>
          </widget>
         </item>
 
=== modified file 'data/qt/mainwindow.ui'
--- data/qt/mainwindow.ui	2011-08-18 22:01:02 +0000
+++ data/qt/mainwindow.ui	2012-02-22 17:08:18 +0000
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Ubuntu One</string>
+   <string notr="true">Ubuntu One</string>
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
 
=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-09-08 22:22:46 +0000
+++ data/qt/preferences.ui	2012-02-22 17:08:18 +0000
@@ -23,7 +23,7 @@
    <item>
     <widget class="QGroupBox" name="bandwidth_settings">
      <property name="title">
-      <string>Bandwidth Settings</string>
+      <string notr="true">Bandwidth Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="margin">
@@ -32,7 +32,7 @@
       <item row="0" column="0">
        <widget class="QCheckBox" name="limit_uploads_checkbox">
         <property name="text">
-         <string>Limit upload speed to</string>
+         <string notr="true">Limit upload speed to</string>
         </property>
        </widget>
       </item>
@@ -49,14 +49,14 @@
       <item row="0" column="2">
        <widget class="QLabel" name="kbps_label_1">
         <property name="text">
-         <string>Kilobits per second</string>
+         <string notr="true">Kilobits per second</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="limit_downloads_checkbox">
         <property name="text">
-         <string>Limit download speed to</string>
+         <string notr="true">Limit download speed to</string>
         </property>
        </widget>
       </item>
@@ -73,7 +73,7 @@
       <item row="2" column="2">
        <widget class="QLabel" name="kbps_label_2">
         <property name="text">
-         <string>Kilobits per second</string>
+         <string notr="true">Kilobits per second</string>
         </property>
        </widget>
       </item>
@@ -93,7 +93,7 @@
       <item row="4" column="0" colspan="3">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Please note that your files will not sync if you set bandwidth to 0</string>
+         <string notr="true">Please note that your files will not sync if you set bandwidth to 0</string>
         </property>
         <property name="scaledContents">
          <bool>false</bool>
@@ -122,7 +122,7 @@
    <item>
     <widget class="QGroupBox" name="file_sync_settings">
      <property name="title">
-      <string>File Sync Settings</string>
+      <string notr="true">File Sync Settings</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_1">
       <property name="margin">
@@ -131,28 +131,28 @@
       <item>
        <widget class="QCheckBox" name="autoconnect_checkbox">
         <property name="text">
-         <string>Connect automatically when computer starts</string>
+         <string notr="true">Connect automatically when computer starts</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
         <property name="text">
-         <string>Automatically sync all new cloud folders to this computer</string>
+         <string notr="true">Automatically sync all new cloud folders to this computer</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="share_autosubscribe_checkbox">
         <property name="text">
-         <string>Automatically sync all folders shared with me to this computer</string>
+         <string notr="true">Automatically sync all folders shared with me to this computer</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="show_all_notifications_checkbox">
         <property name="text">
-         <string>Allow all notifications to this device</string>
+         <string notr="true">Allow all notifications to this device</string>
         </property>
        </widget>
       </item>
@@ -193,14 +193,14 @@
      <item>
       <widget class="QPushButton" name="apply_changes_button">
        <property name="text">
-        <string>Apply these settings</string>
+        <string notr="true">Apply these settings</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="restore_defaults_button">
        <property name="text">
-        <string>Default settings</string>
+        <string notr="true">Default settings</string>
        </property>
        <property name="secondary" stdset="0">
         <bool>true</bool>
 
=== modified file 'data/qt/signin.ui'
--- data/qt/signin.ui	2011-11-14 20:42:04 +0000
+++ data/qt/signin.ui	2012-02-22 17:08:18 +0000
@@ -10,9 +10,6 @@
     <height>312</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QHBoxLayout" name="horizontalLayout_3">
    <property name="margin">
     <number>0</number>
@@ -29,14 +26,14 @@
       <item>
        <widget class="QLabel" name="sign_in_label">
         <property name="text">
-         <string>Sign in to Ubuntu One</string>
+         <string notr="true">Sign in to Ubuntu One</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="description_label">
         <property name="text">
-         <string>Sign in with your existing Ubuntu One username and password.</string>
+         <string notr="true">Sign in with your existing Ubuntu One username and password.</string>
         </property>
        </widget>
       </item>
@@ -55,7 +52,7 @@
             <item>
              <widget class="QLabel" name="email_label">
               <property name="text">
-               <string>Email address</string>
+               <string notr="true">Email address</string>
               </property>
              </widget>
             </item>
@@ -76,7 +73,7 @@
             <item>
              <widget class="QLabel" name="password_label">
               <property name="text">
-               <string>Password</string>
+               <string notr="true">Password</string>
               </property>
              </widget>
             </item>
@@ -94,7 +91,7 @@
             <item>
              <widget class="QPushButton" name="signin_button">
               <property name="text">
-               <string>Sign in</string>
+               <string notr="true">Sign in</string>
               </property>
               <property name="default">
                <bool>true</bool>
@@ -104,7 +101,7 @@
             <item>
              <widget class="QPushButton" name="cancel_button">
               <property name="text">
-               <string>Cancel</string>
+               <string notr="true">Cancel</string>
               </property>
               <property name="secondary" stdset="0">
                <bool>true</bool>
@@ -137,7 +134,7 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string>Forgot your password?</string>
+               <string notr="true">Forgot your password?</string>
               </property>
              </widget>
             </item>
 
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-02-22 12:09:28 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-02-22 17:08:18 +0000
@@ -74,7 +74,9 @@
 TWITTER_LINK = u'http://twitter.com/ubuntuone/'
 
 # Undefined variable '_', pylint: disable=E0602
+# Translatable strings
 
+ACCOUNT_LABEL = _('Your services')
 ALWAYS_SUBSCRIBED = _('Always in sync')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
 CONTACTS = _('Thunderbird plug-in')
@@ -93,9 +95,13 @@
 DEVICE_REMOVAL_ERROR = _('The device could not be removed.')
 DEVICES_BUTTON_TOOLTIP = _('Manage devices registered with your personal '
                            'cloud')
+DEVICES_LOCAL_LABEL = _('This device')
+DEVICES_MANAGE_LABEL = _('Go to the web page to manage your other devices')
+DEVICES_REMOTE_LABEL = _('Other devices')
 DEVICES_TITLE = _('The devices connected with your personal cloud are listed '
                   'below.')
-EXPLORE = _('Explore')
+EDIT_ACCOUNT_LABEL = _('Edit your services  online')
+EDIT_PROFILE_LABEL = _('Edit personal details online')
 FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed')
 FOLDER_ADD_BUTTON_TEXT = _('Sync another folder with your cloud')
 FOLDER_INVALID_PATH = _('The chosen directory "%(folder_path)s" is not valid. '
@@ -105,12 +111,18 @@
                         'cloud folder.')
 FOLDER_OWNED_BY = _('My personal folders')
 FOLDER_SHARED_BY = _('Shared by %(other_user_display_name)s')
+FOLDERS_BUTTON_ADD_FOLDER = _('Add a folder from this computer')
+FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '
+                                                     'folders')
+FOLDERS_COLUMN_EXPLORE = _('Explore')
+FOLDERS_COLUMN_NAME = _('Name')
+FOLDERS_COLUMN_SYNC_LOCALLY = _('Sync Locally?')
 FOLDERS_CONFIRM_MERGE = _('The contents of your cloud folder will be merged '
                           'with your local folder "%(folder_path)s" when '
                           'subscribing.\nDo you want to subscribe to this '
                           'cloud folder?')
-FOLDERS_BUTTON_TOOLTIP = VOLUMES_BUTTON_TOOLTIP = _('Manage your cloud '
-                                                     'folders')
+FOLDERS_MANAGE_LABEL = _('Go to the web for public and private sharing '
+    'options')
 FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '
   'this computer')
 FILE_SYNC_CONNECT = _('Connect')
@@ -139,6 +151,8 @@
 GENERAL_ERROR_TITLE = _('Ubuntu One experienced an error')
 GENERAL_ERROR_MSG = _('Sorry, an error has occurred and Ubuntu One '
                       'needs to close.')
+GET_HELP_ONLINE = _('Get help online')
+GET_MORE_STORAGE = _('Get more storage')
 GREETING = _('Hi %(user_display_name)s')
 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
                     '</i> in order to enable more sync services.')
@@ -146,11 +160,16 @@
                    '%(service_name)s')
 INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
 LOADING = _('Loading...')
+LOADING_OVERLAY = _('Getting information, please wait...')
+MAIN_ACCOUNT_TAB = _('Account information')
+MAIN_DEVICES_TAB = _('Devices')
+MAIN_FOLDERS_TAB = _('Folders')
+MAIN_PREFERENCES_TAB = _('Settings')
 MAIN_WINDOW_TITLE = _('%(app_name)s Control Panel')
+MUSIC_DISPLAY_NAME = _('Purchased Music')
+MUSIC_REAL_PATH = '.ubuntuone/Purchased from Ubuntu One'
 MY_FOLDERS = _('My folders')
 NAME_NOT_SET = _('[unknown user name]')
-MUSIC_DISPLAY_NAME = _('Purchased Music')
-MUSIC_REAL_PATH = '.ubuntuone/Purchased from Ubuntu One'
 NETWORK_OFFLINE = _('An internet connection is required to join or sign '
                     'in to %(app_name)s.')
 NO_DEVICES = _('No devices to show.')
@@ -158,18 +177,45 @@
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
 PERCENTAGE_LABEL = _('%(percentage)s used')
 PLEASE_WAIT = _('Please wait')
+PROFILE_LABEL = _('Personal details')
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
-USAGE_LABEL = _('%(used)s of %(total)s')
+REMOVE_BUTTON = _('Remove')
+RESTORE_LABEL = _('Restore')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
 SERVICES_TITLE = _('Enable the sync services for this computer.')
+SETTINGS_ALLOW_NOTIFICATIONS = _('Allow all notifications to this device')
+SETTINGS_AUTO_CONNECT = _('Connect automatically when computer starts')
+SETTINGS_BANDWIDTH = _('Bandwidth Settings')
+SETTINGS_BANDWIDTH_ZERO_WARNING = _('Please note that your files will not '
+    'sync if you set bandwidth to 0')
+SETTINGS_BUTTON_APPLY = _('Apply these settings')
+SETTINGS_BUTTON_DEFAULT = _('Default settings')
 SETTINGS_CHANGE_ERROR = _('The settings could not be changed,\n'
                           'previous values were restored.')
+SETTINGS_FILE_SYNC = _('File Sync Settings')
+SETTINGS_KILOBITS_PER_SECOND = _('Kilobits per second')
+SETTINGS_LIMIT_DOWNLOAD = _('Limit download speed to')
+SETTINGS_LIMIT_UPLOAD = _('Limit upload speed to')
+SETTINGS_SYNC_ALL_FOLDERS = _('Automatically sync all new cloud folders '
+    'to this computer')
+SETTINGS_SYNC_ALL_SHARES = _('Automatically sync all folders shared with me '
+    'to this computer')
 SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
 SHARES_TITLE = _('Manage permissions for shares made to other users.')
+SIGNIN_BUTTON = _('Sign in')
+SIGNIN_CANCEL = _('Cancel')
+SIGNIN_DESCRIPTION = _('Sign in with your existing Ubuntu One '
+    'username and password.')
+SIGNIN_EMAIL = _('Email address')
+SIGNIN_FORGOT_PASSWORD = _('Forgot your password?')
+SIGNIN_PASSWORD = _('Password')
+SIGNIN_TITLE = _('Sign in to Ubuntu One')
 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
-SYNC_LOCALLY = _('Sync locally?')
+TALK_TO_US = _('Talk to us')
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')
+USAGE_LABEL = _('%(used)s of %(total)s')
+QUIT_LABEL = _('Quit Ubuntu One')
 
 # pylint: enable=E0602
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/account.py'
--- ubuntuone/controlpanel/gui/qt/account.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/account.py	2012-02-22 17:08:18 +0000
@@ -23,8 +23,12 @@
 
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
+    ACCOUNT_LABEL,
+    EDIT_ACCOUNT_LABEL,
     EDIT_ACCOUNT_LINK,
+    EDIT_PROFILE_LABEL,
     EDIT_PROFILE_LINK,
+    PROFILE_LABEL,
 )
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import account_ui
@@ -42,8 +46,12 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(AccountPanel, self)._setup()
+        self.ui.services.setTitle(ACCOUNT_LABEL)
+        self.ui.edit_services_button.setText(EDIT_ACCOUNT_LABEL)
+        self.ui.edit_services_button.uri = EDIT_ACCOUNT_LINK
+        self.ui.edit_profile_button.setText(EDIT_PROFILE_LABEL)
         self.ui.edit_profile_button.uri = EDIT_PROFILE_LINK
-        self.ui.edit_services_button.uri = EDIT_ACCOUNT_LINK
+        self.ui.profile_info.setTitle(PROFILE_LABEL)
 
     # pylint: disable=E0202
     @defer.inlineCallbacks
 
=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-01-31 20:33:22 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-02-22 17:08:18 +0000
@@ -24,13 +24,20 @@
 from ubuntuone.controlpanel.backend import AUTOCONNECT_KEY
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
-    humanize,
-    show_quota_warning,
     EDIT_SERVICES_LINK,
     FACEBOOK_LINK,
+    GET_HELP_ONLINE,
+    GET_MORE_STORAGE,
     GET_SUPPORT_LINK,
     GREETING,
+    humanize,
+    MAIN_ACCOUNT_TAB,
+    MAIN_DEVICES_TAB,
+    MAIN_FOLDERS_TAB,
+    MAIN_PREFERENCES_TAB,
     PERCENTAGE_LABEL,
+    show_quota_warning,
+    TALK_TO_US,
     TWITTER_LINK,
     USAGE_LABEL,
 )
@@ -53,12 +60,28 @@
 
     def _setup(self):
         """Do some extra setupping for the UI."""
+        self.ui.get_more_space_button.setText(GET_MORE_STORAGE)
         self.ui.get_more_space_button.uri = EDIT_SERVICES_LINK
+
+        self.ui.help_button.setText(GET_HELP_ONLINE)
         self.ui.help_button.uri = GET_SUPPORT_LINK
+
+        self.ui.follow_us_label.setText(TALK_TO_US)
+
         self.ui.devices_tab.localDeviceRemoved.connect(
             self.on_credentials_not_found)
         self.ui.signin.credentialsFound.connect(lambda creds: self.load())
 
+        self.ui.tab_widget.setTabText(
+            self.ui.tab_widget.indexOf(self.ui.folders_tab), MAIN_FOLDERS_TAB)
+        self.ui.tab_widget.setTabText(
+            self.ui.tab_widget.indexOf(self.ui.devices_tab), MAIN_DEVICES_TAB)
+        self.ui.tab_widget.setTabText(
+            self.ui.tab_widget.indexOf(self.ui.preferences_tab),
+            MAIN_PREFERENCES_TAB)
+        self.ui.tab_widget.setTabText(
+            self.ui.tab_widget.indexOf(self.ui.account_tab), MAIN_ACCOUNT_TAB)
+
     @defer.inlineCallbacks
     def connect_file_sync(self):
         """Connect file sync service if the setting autoconnect is enabled."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/device.py'
--- ubuntuone/controlpanel/gui/qt/device.py	2011-11-28 15:06:18 +0000
+++ ubuntuone/controlpanel/gui/qt/device.py	2012-02-22 17:08:18 +0000
@@ -26,7 +26,10 @@
     DEVICE_TYPE_PHONE,
 )
 from ubuntuone.controlpanel import cache
-from ubuntuone.controlpanel.gui import DEVICE_CONFIRM_REMOVE
+from ubuntuone.controlpanel.gui import (
+    DEVICE_CONFIRM_REMOVE,
+    REMOVE_BUTTON,
+)
 from ubuntuone.controlpanel.gui.qt import (
     handle_errors,
     pixmap_from_name,
@@ -68,6 +71,13 @@
         super(DeviceWidget, self).__init__(*args, **kwargs)
         self.ui = device_ui.Ui_Form()
         self.ui.setupUi(self)
+
+        # The following is a hack to avoid having the faked self.ui failing
+        # with AttributeError in the tests. We need to improve the fake so we
+        # don't leak this to the production code.
+        if getattr(self.ui, 'remove_device_button', None) is not None:
+            self.ui.remove_device_button.setText(REMOVE_BUTTON)
+
         self.id = device_id
 
     def update_device_info(self, device_info):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2012-01-04 18:51:08 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2012-02-22 17:08:18 +0000
@@ -25,7 +25,12 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.gui import EDIT_DEVICES_LINK
+from ubuntuone.controlpanel.gui import (
+    DEVICES_LOCAL_LABEL,
+    DEVICES_MANAGE_LABEL,
+    DEVICES_REMOTE_LABEL,
+    EDIT_DEVICES_LINK,
+)
 from ubuntuone.controlpanel.gui.qt.ui import devices_ui
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt import device
@@ -45,6 +50,9 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(DevicesPanel, self)._setup()
+        self.ui.local_device.setTitle(DEVICES_LOCAL_LABEL)
+        self.ui.other_devices.setTitle(DEVICES_REMOTE_LABEL)
+        self.ui.manage_devices_button.setText(DEVICES_MANAGE_LABEL)
         self.ui.manage_devices_button.uri = EDIT_DEVICES_LINK
 
     # pylint: disable=E0202
 
=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-02-06 21:10:10 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-02-22 17:08:18 +0000
@@ -26,18 +26,21 @@
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     ALWAYS_SUBSCRIBED,
-    EXPLORE,
     FOLDER_ICON_NAME,
     FOLDER_OWNED_BY,
     FOLDER_SHARED_BY,
+    FOLDERS_BUTTON_ADD_FOLDER,
+    FOLDERS_COLUMN_EXPLORE,
+    FOLDERS_COLUMN_NAME,
+    FOLDERS_COLUMN_SYNC_LOCALLY,
     FOLDERS_CONFIRM_MERGE,
+    FOLDERS_MANAGE_LABEL,
     MANAGE_FILES_LINK,
     MUSIC_ICON_NAME,
     MUSIC_DISPLAY_NAME,
     MUSIC_REAL_PATH,
     NAME_NOT_SET,
     SHARE_ICON_NAME,
-    SYNC_LOCALLY,
 )
 from ubuntuone.controlpanel.gui.qt import uri_hook, icon_from_name
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
@@ -68,13 +71,18 @@
         """Do some extra setupping for the UI."""
         super(FoldersPanel, self)._setup()
         self.ui.add_folder_button.folderCreated.connect(self.on_folder_created)
+        self.ui.add_folder_button.setText(FOLDERS_BUTTON_ADD_FOLDER)
 
+        self.ui.folders.headerItem().setText(0, FOLDERS_COLUMN_NAME)
+        self.ui.folders.headerItem().setText(1, FOLDERS_COLUMN_SYNC_LOCALLY)
+        self.ui.folders.headerItem().setText(2, FOLDERS_COLUMN_EXPLORE)
         headers = self.ui.folders.header()
         headers.setResizeMode(FOLDER_NAME_COL, headers.Stretch)
         headers.setResizeMode(SUBSCRIPTION_COL, headers.ResizeToContents)
         headers.setResizeMode(EXPLORE_COL, headers.ResizeToContents)
         headers.setStretchLastSection(False)
 
+        self.ui.share_publish_button.setText(FOLDERS_MANAGE_LABEL)
         self.ui.share_publish_button.uri = MANAGE_FILES_LINK
         icon = icon_from_name('external_icon_orange')
         self.ui.share_publish_button.setIcon(icon)
@@ -118,7 +126,7 @@
 
             item = QtGui.QTreeWidgetItem()
             item.setText(FOLDER_NAME_COL, name)
-            item.setText(SUBSCRIPTION_COL, SYNC_LOCALLY)
+            item.setText(SUBSCRIPTION_COL, FOLDERS_COLUMN_SYNC_LOCALLY)
             item.setSizeHint(FOLDER_NAME_COL, QtCore.QSize(-1, 20))
             brush = QtGui.QBrush(QtGui.QColor('#d6d3cf'))
             for col in (FOLDER_NAME_COL, SUBSCRIPTION_COL, EXPLORE_COL):
@@ -141,7 +149,7 @@
                 name = self._process_name(volume[u'display_name'])
                 child.setText(FOLDER_NAME_COL, name)
                 child.setToolTip(FOLDER_NAME_COL, name)
-                child.setToolTip(EXPLORE_COL, EXPLORE)
+                child.setToolTip(EXPLORE_COL, FOLDERS_COLUMN_EXPLORE)
 
                 icon_name = FOLDER_ICON_NAME
                 if is_share:
@@ -170,7 +178,7 @@
                 model_index = self.ui.folders.indexFromItem(child, EXPLORE_COL)
                 button = QtGui.QPushButton(parent=self.ui.folders)
                 button.setFlat(True)
-                button.setText(EXPLORE)
+                button.setText(FOLDERS_COLUMN_EXPLORE)
                 button.setObjectName('explore_folder_button')
                 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
                                            QtGui.QSizePolicy.Fixed)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2011-09-02 17:59:39 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-02-22 17:08:18 +0000
@@ -20,6 +20,7 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.controlpanel.gui import LOADING_OVERLAY
 from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui
 
 
@@ -44,6 +45,12 @@
         self.counter = 0
         self.orientation = False
 
+        # The following is a hack to avoid having the faked self.ui failing
+        # with AttributeError in the tests. We need to improve the fake so we
+        # don't leak this to the production code.
+        if getattr(self.ui, 'label', None) is not None:
+            self.ui.label.setText(LOADING_OVERLAY)
+
     # Invalid name "paintEvent"
     # pylint: disable=C0103
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py	2012-02-22 17:08:18 +0000
@@ -26,7 +26,21 @@
 
 from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.gui import KILOBYTES
+from ubuntuone.controlpanel.gui import (
+    KILOBYTES,
+    SETTINGS_ALLOW_NOTIFICATIONS,
+    SETTINGS_AUTO_CONNECT,
+    SETTINGS_BANDWIDTH,
+    SETTINGS_BANDWIDTH_ZERO_WARNING,
+    SETTINGS_BUTTON_APPLY,
+    SETTINGS_BUTTON_DEFAULT,
+    SETTINGS_FILE_SYNC,
+    SETTINGS_KILOBITS_PER_SECOND,
+    SETTINGS_LIMIT_DOWNLOAD,
+    SETTINGS_LIMIT_UPLOAD,
+    SETTINGS_SYNC_ALL_FOLDERS,
+    SETTINGS_SYNC_ALL_SHARES,
+)
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import preferences_ui
 
@@ -64,6 +78,24 @@
     ui_class = preferences_ui
     logger = logger
 
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        super(PreferencesPanel, self)._setup()
+        self.ui.apply_changes_button.setText(SETTINGS_BUTTON_APPLY)
+        self.ui.autoconnect_checkbox.setText(SETTINGS_AUTO_CONNECT)
+        self.ui.bandwidth_settings.setTitle(SETTINGS_BANDWIDTH)
+        self.ui.file_sync_settings.setTitle(SETTINGS_FILE_SYNC)
+        self.ui.kbps_label_1.setText(SETTINGS_KILOBITS_PER_SECOND)
+        self.ui.kbps_label_2.setText(SETTINGS_KILOBITS_PER_SECOND)
+        self.ui.label_2.setText(SETTINGS_BANDWIDTH_ZERO_WARNING)
+        self.ui.limit_uploads_checkbox.setText(SETTINGS_LIMIT_UPLOAD)
+        self.ui.limit_downloads_checkbox.setText(SETTINGS_LIMIT_DOWNLOAD)
+        self.ui.restore_defaults_button.setText(SETTINGS_BUTTON_DEFAULT)
+        self.ui.share_autosubscribe_checkbox.setText(SETTINGS_SYNC_ALL_FOLDERS)
+        self.ui.show_all_notifications_checkbox.setText(
+            SETTINGS_ALLOW_NOTIFICATIONS)
+        self.ui.udf_autosubscribe_checkbox.setText(SETTINGS_SYNC_ALL_SHARES)
+
     # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/signin.py'
--- ubuntuone/controlpanel/gui/qt/signin.py	2011-09-08 01:15:15 +0000
+++ ubuntuone/controlpanel/gui/qt/signin.py	2012-02-22 17:08:18 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -21,7 +19,16 @@
 from PyQt4 import QtCore
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import RESET_PASSWORD_LINK
+from ubuntuone.controlpanel.gui import (
+    RESET_PASSWORD_LINK,
+    SIGNIN_BUTTON,
+    SIGNIN_CANCEL,
+    SIGNIN_DESCRIPTION,
+    SIGNIN_EMAIL,
+    SIGNIN_FORGOT_PASSWORD,
+    SIGNIN_PASSWORD,
+    SIGNIN_TITLE,
+)
 from ubuntuone.controlpanel.gui.qt import icon_from_name, handle_errors
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import signin_ui
@@ -43,11 +50,18 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(SignInPanel, self)._setup()
+        self.ui.cancel_button.setText(SIGNIN_CANCEL)
+        self.ui.description_label.setText(SIGNIN_DESCRIPTION)
+        self.ui.email_label.setText(SIGNIN_EMAIL)
+        self.ui.sign_in_label.setText(SIGNIN_TITLE)
+        self.ui.password_label.setText(SIGNIN_PASSWORD)
 
+        self.ui.forgot_password_button.setText(SIGNIN_FORGOT_PASSWORD)
         self.ui.forgot_password_button.uri = RESET_PASSWORD_LINK
         icon = icon_from_name('external_icon_orange')
         self.ui.forgot_password_button.setIcon(icon)
 
+        self.ui.signin_button.setText(SIGNIN_BUTTON)
         self.ui.signin_button.setEnabled(False)
         for entry in (self.ui.email_entry, self.ui.password_entry):
             entry.textChanged.connect(self.validate)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-02-06 21:10:10 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-02-22 17:08:18 +0000
@@ -20,6 +20,11 @@
 
 from ubuntuone.platform.tools import SyncDaemonTool
 
+from ubuntuone.controlpanel.gui import (
+    RESTORE_LABEL,
+    QUIT_LABEL,
+)
+
 
 class TrayIcon(QtGui.QSystemTrayIcon):
 
@@ -32,9 +37,9 @@
         self.window = window
         self.activated.connect(self.on_activated)
         self.context_menu = QtGui.QMenu()
-        self.restore = QtGui.QAction("Restore", self,
+        self.restore = QtGui.QAction(RESTORE_LABEL, self,
             triggered=self.restore_window)
-        self.quit = QtGui.QAction("Quit Ubuntu One", self,
+        self.quit = QtGui.QAction(QUIT_LABEL, self,
             triggered=self.stop)
         self.context_menu.addAction(self.restore)
         self.context_menu.addSeparator()
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-11-23 17:27:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-02-22 17:08:18 +0000
@@ -86,7 +86,8 @@
     def assert_folder_group_header_correct(self, item, name):
         """Check that the folder group header is correct."""
         self.assertEqual(item.text(gui.FOLDER_NAME_COL), name)
-        self.assertEqual(item.text(gui.SUBSCRIPTION_COL), gui.SYNC_LOCALLY)
+        self.assertEqual(item.text(gui.SUBSCRIPTION_COL),
+                         gui.FOLDERS_COLUMN_SYNC_LOCALLY)
         self.assertEqual(item.text(gui.EXPLORE_COL), '')
 
     @defer.inlineCallbacks
@@ -165,7 +166,8 @@
 
                 # tooltips are correct
                 self.assertEqual(item.toolTip(gui.FOLDER_NAME_COL), name)
-                self.assertEqual(item.toolTip(gui.EXPLORE_COL), gui.EXPLORE)
+                self.assertEqual(item.toolTip(gui.EXPLORE_COL),
+                                 gui.FOLDERS_COLUMN_EXPLORE)
 
                 # explore button is in place
                 model_index = folders.indexFromItem(item, gui.EXPLORE_COL)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/__init__.py'
--- ubuntuone/controlpanel/gui/qt/ui/__init__.py	2011-07-11 11:19:09 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/__init__.py	2012-02-22 17:08:18 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published