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

Proposed by Jeremy Bicha on 2012-03-08
Status: Merged
Approved by: Roberto Alsina on 2012-03-20
Approved revision: 903
Merged at revision: 930
Proposed branch: lp:~jbicha/ubuntu-sso-client/lp-949978-improve-grammar
Merge into: lp:ubuntu-sso-client
Diff against target: 25 lines (+2/-2)
2 files modified
data/qt/setup_account.ui (+1/-1)
ubuntu_sso/utils/ui.py (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu-sso-client/lp-949978-improve-grammar
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve on 2012-03-20
Natalia Bidart 2012-03-08 Approve on 2012-03-20
Paolo Rotolo (community) Approve on 2012-03-08
Review via email: mp+96586@code.launchpad.net

Commit message

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

To post a comment you must log in.
Paolo Rotolo (paolorotolo) :
review: Approve
Paolo Rotolo (paolorotolo) wrote :

Good for me!

Natalia Bidart (nataliabidart) wrote :

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

review: Approve
Roberto Alsina (ralsina) wrote :

Got the ok for the changes from cparrino

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/qt/setup_account.ui'
2--- data/qt/setup_account.ui 2012-03-05 21:52:45 +0000
3+++ data/qt/setup_account.ui 2012-03-08 14:56:18 +0000
4@@ -412,7 +412,7 @@
5 </font>
6 </property>
7 <property name="toolTip">
8- <string notr="true">Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
9+ <string notr="true">Your password must be at least 8 characters long and contain at least one number and one uppercase letter.</string>
10 </property>
11 <property name="statusTip">
12 <string/>
13
14=== modified file 'ubuntu_sso/utils/ui.py'
15--- ubuntu_sso/utils/ui.py 2012-03-06 14:13:10 +0000
16+++ ubuntu_sso/utils/ui.py 2012-03-08 14:56:18 +0000
17@@ -43,7 +43,7 @@
18 CAPTCHA_RELOAD_TEXT = _('refresh')
19 CAPTCHA_RELOAD_TOOLTIP = _('Reload')
20 CAPTCHA_REQUIRED_ERROR = _('The captcha is a required field')
21-CLOSE_AND_SETUP_LATER = _('Close window and setup later')
22+CLOSE_AND_SETUP_LATER = _('Close window and set up later')
23 CONGRATULATIONS = _("Congratulations, {app_name} is installed!")
24 CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s enter your '
25 'details below.')

Subscribers

People subscribed via source and target branches