← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~mcintire-evan/ubuntu-terminal-app/change-auth into lp:ubuntu-terminal-app

 

Evan McIntire has proposed merging lp:~mcintire-evan/ubuntu-terminal-app/change-auth into lp:ubuntu-terminal-app.

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.

Requested reviews:
  Nicholas Skaggs (nskaggs)
  Alan Pope  (popey)
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration

For more details, see:
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/change-auth/+merge/283240

Changes authentication dialogue to "Enter passcode or passphrase" instead of "Enter password", to be more in line with other parts of the OS
-- 
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.
=== 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 <LL@xxxxxx>\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)


References