Ubuntu Terminal App

Merge lp://staging/~mcintire-evan/ubuntu-terminal-app/change_auth_dialog into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

  1. change_auth_dialog
  2. Merge into reboot
Proposed by Evan McIntire
Status: Superseded
Proposed branch: lp://staging/~mcintire-evan/ubuntu-terminal-app/change_auth_dialog
Merge into: lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 48 lines (+5/-5)
2 files modified
po/com.ubuntu.terminal.pot (+3/-3)
src/app/qml/AuthenticationDialog.qml (+2/-2)
To merge this branch: bzr merge lp://staging/~mcintire-evan/ubuntu-terminal-app/change_auth_dialog
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Nicholas Skaggs (community) Needs Fixing
Jenkins Bot continuous-integration Needs Fixing
Review via email: mp+280781@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-01-20.

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.
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thank you for your contribution!

Please see my inline comment. If you fix it, we can happily merge this. ;)

Revision history for this message
Evan McIntire (mcintire-evan) wrote :

Whoops, can't believe I made that mistake. Uploading a fix in a moment, thanks! :)

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Great! Thanks Evan.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/change_auth_dialog/+merge/280781/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-autolanding/9/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1461/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

:-(

Text conflict in po/com.ubuntu.terminal.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

review: Needs Fixing
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This needs to land after updating so pot file doesn't cause havoc again.

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Works! No typos! :D

review: Approve

Unmerged revisions

144. By Evan McIntire

Fixed type ('passcore' -> 'passcode')

143. By Evan McIntire

Change Auth Dialog to be in line with other apps
("Enter Password" to "Enter Passcode or Passphrase")

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches