Merge lp:~mcintire-evan/ubuntu-terminal-app/change-auth into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Evan McIntire]

Changes authentication dialogue to "Enter passcode or passphrase" instead of "Enter password", to be more in line with other parts of the OS.

Changes authentication dialogue to "Enter passcode or passphrase" instead of "Enter password", to be more in line with other parts of the OS

[Niklas Wenzel (nikwen)]

Thank you for your contribution!

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

[Evan McIntire (mcintire-evan)]

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

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Great! Thanks Evan.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Nicholas Skaggs (nskaggs)]

:-(

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

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

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

[Evan McIntire (mcintire-evan)]

Redid it with a fresh branch, and no typo this time :)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works! No typos! :D

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I suspect I left a comment in the wrong place :)

review: Approve

[Niklas Wenzel (nikwen)]

I think we need to kick off the landing here. Thank you for the patch and for fixing the typo. :)

(Sadly, I didn't get any notification that you updated the MP so that's why I didn't respond earlier ...)

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2015-12-19 05:14:39 +0000
+++ po/com.ubuntu.terminal.pot	2016-01-20 01:26:16 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the  package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"POT-Creation-Date: 2016-01-19 20:23-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -34,11 +34,11 @@
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter password:"
+msgid "Enter passcode or passphrase:"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "password"
+msgid "passcode or passphrase"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 
=== modified file 'src/app/qml/AuthenticationDialog.qml'
--- src/app/qml/AuthenticationDialog.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/AuthenticationDialog.qml	2016-01-20 01:26:16 +0000
@@ -24,7 +24,7 @@
 
     title: i18n.tr("Authentication required")
 
-    text: i18n.tr("Enter password:")
+    text: i18n.tr("Enter passcode or passphrase:")
 
     signal passwordEntered(string password)
     signal dialogCanceled
@@ -37,7 +37,7 @@
         id: passwordField
         objectName: "inputField"
 
-        placeholderText: i18n.tr("password")
+        placeholderText: i18n.tr("passcode or passphrase")
         echoMode: TextInput.Password
 
         onAccepted: okButton.clicked(text)