Ubuntu Single Sign On Client

Merge lp://staging/~chipaca/ubuntu-sso-client/label-fixes into lp://staging/ubuntu-sso-client

label-fixes
Merge into trunk

Proposed by John Lenton on 2010-08-26

Status:

Merged

Approved by:

Natalia Bidart on 2010-08-26

Approved revision:

591

Merged at revision:

595

Proposed branch:

lp://staging/~chipaca/ubuntu-sso-client/label-fixes

Merge into:

lp://staging/ubuntu-sso-client

Diff against target:

151 lines (+21/-35)

4 files modified

data/ui.glade (+1/-10)
setup.py (+1/-1)
ubuntu_sso/gui.py (+14/-14)
ubuntu_sso/tests/test_gui.py (+5/-10)

To merge this branch:

bzr merge lp://staging/~chipaca/ubuntu-sso-client/label-fixes

Related bugs:

Bug #622830: Email screenshot and T&C are not translatable	High	Invalid
Bug #622988: Verify screen copy changes	Medium	Fix Released
Bug #622991: Reset password screen copy changes	Medium	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Vincenzo Di Somma (community)		Approve on 2010-08-26
Rodrigo Moya (community)	2010-08-26	Approve on 2010-08-26
Review via email: mp+33722@code.staging.launchpad.net

Commit message

* changed the "reset password" header and help text (LP: #622991).
* changed the "verify" header and help text, and removed the email image (LP: #622988, LP: #622830).

Description of the change

* changed the "reset password" header and help text (LP: #622991).
* changed the "verify" header and help text, and removed the email image (LP: #622988, LP: #622830)