Merge lp://staging/~mcintire-evan/ubuntu-terminal-app/change-auth into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Proposed by
Evan McIntire
Status: | Merged |
---|---|
Approved by: | Niklas Wenzel |
Approved revision: | 152 |
Merged at revision: | 152 |
Proposed branch: | lp://staging/~mcintire-evan/ubuntu-terminal-app/change-auth |
Merge into: | lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot |
Diff against target: |
56 lines (+6/-6) 2 files modified
po/com.ubuntu.terminal.pot (+4/-4) src/app/qml/AuthenticationDialog.qml (+2/-2) |
To merge this branch: | bzr merge lp://staging/~mcintire-evan/ubuntu-terminal-app/change-auth |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Niklas Wenzel (community) | Approve | ||
Alan Pope πΊπ§π± π¦ (community) | Approve | ||
Nicholas Skaggs | Pending | ||
Review via email: mp+283240@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-12-16.
Commit message
Changes authentication dialogue to "Enter passcode or passphrase" instead of "Enter password", to be more in line with other parts of the OS.
Description of the change
Changes authentication dialogue to "Enter passcode or passphrase" instead of "Enter password", to be more in line with other parts of the OS
To post a comment you must log in.
Thank you for your contribution!
Please see my inline comment. If you fix it, we can happily merge this. ;)