Merge lp:~jbicha/ubuntu-sso-client/lp-949978-improve-grammar into lp:ubuntu-sso-client

[Jeremy Bícha]

- Improve the grammar for the CLOSE_AND_SETUP_LATER button text (LP: #949978).

[Paolo Rotolo (paolorotolo)]

review: Approve

[Paolo Rotolo (paolorotolo)]

Good for me!

[Natalia Bidart (nataliabidart)]

After seeking approval from the design team, approving this myself.

review: Approve

[Roberto Alsina (ralsina)]

Got the ok for the changes from cparrino

review: Approve

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2012-03-05 21:52:45 +0000
+++ data/qt/setup_account.ui	2012-03-08 14:56:18 +0000
@@ -412,7 +412,7 @@
           </font>
          </property>
          <property name="toolTip">
-          <string notr="true">Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
+          <string notr="true">Your password must be at least 8 characters long and contain at least one number and one uppercase letter.</string>
          </property>
          <property name="statusTip">
           <string/>
 
=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-03-06 14:13:10 +0000
+++ ubuntu_sso/utils/ui.py	2012-03-08 14:56:18 +0000
@@ -43,7 +43,7 @@
 CAPTCHA_RELOAD_TEXT = _('refresh')
 CAPTCHA_RELOAD_TOOLTIP = _('Reload')
 CAPTCHA_REQUIRED_ERROR = _('The captcha is a required field')
-CLOSE_AND_SETUP_LATER = _('Close window and setup later')
+CLOSE_AND_SETUP_LATER = _('Close window and set up later')
 CONGRATULATIONS = _("Congratulations, {app_name} is installed!")
 CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s enter your '
     'details below.')