Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/bug_579561 into lp:canonical-identity-provider/release

  1. bug_579561
  2. Merge into trunk
Proposed by Danny Tamez
Status: Merged
Merged at revision: 19
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/bug_579561
Merge into: lp:canonical-identity-provider/release
Diff against target: 21 lines (+2/-2)
1 file modified
identityprovider/branding.py (+2/-2)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/bug_579561
Reviewer Review Type Date Requested Status
Anthony Lenton (community) Approve
Review via email: mp+25174@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Anthony Lenton (elachuni) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/branding.py'
2--- identityprovider/branding.py 2010-04-21 15:29:24 +0000
3+++ identityprovider/branding.py 2010-05-12 17:20:44 +0000
4@@ -10,7 +10,7 @@
5 name = _('Launchpad Login Service')
6 provides_access = _('A Lauchpad Login Service account is free and gives '
7 'you access to Ubuntu One, the Ubuntu Shop '
8- 'and many more usefulservices.')
9+ 'and many more useful services.')
10 create_account = _('Create a Launchpad Login Service account')
11 server_info = _('This is the Launchpad login service, built on OpenID. '
12 'The service enables you to use your Launchpad account '
13@@ -22,7 +22,7 @@
14 name = _('Ubuntu Single Sign On')
15 provides_access = _('An Ubuntu Single Sign On account is free and gives '
16 'you access to Ubuntu One, the Ubuntu Shop '
17- 'and many more usefulservices.')
18+ 'and many more useful services.')
19 create_account = _('Create an Ubuntu Single Sign On account')
20 server_info = _('This is the Ubuntu SSO service, built on OpenID. The '
21 'service enables you to use your Ubuntu SSO account to '