Merge lp://staging/~dobey/pay-ui/clarify into lp://staging/pay-ui
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | Alejandro J. Cura |
Approved revision: | 102 |
Merged at revision: | 102 |
Proposed branch: | lp://staging/~dobey/pay-ui/clarify |
Merge into: | lp://staging/pay-ui |
Diff against target: |
210 lines (+44/-61) 2 files modified
app/ui/CheckoutPage.qml (+18/-18) po/com.canonical.payui.pot (+26/-43) |
To merge this branch: | bzr merge lp://staging/~dobey/pay-ui/clarify |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alejandro J. Cura (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Change password hint string to indicate it is for U1.
Remove the single quotes around the e-mail address.
Move separator up between login/pay options, rather than pay options/buttons.
Description of the change
This branches introduces a new string. We'll need to land in trunk and then get update translations for the new string, before releasing to the store/image.
To post a comment you must log in.
PASSED: Continuous integration, rev:102 jenkins. qa.ubuntu. com/job/ pay-ui- ci/124/ jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/158 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 351 jenkins. qa.ubuntu. com/job/ pay-ui- vivid-amd64- ci/21 jenkins. qa.ubuntu. com/job/ pay-ui- vivid-armhf- ci/21 jenkins. qa.ubuntu. com/job/ pay-ui- vivid-armhf- ci/21/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ pay-ui- vivid-i386- ci/21 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/792 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 352 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18220
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/pay- ui-ci/124/ rebuild
http://