on xenial help sign in
add incorrect password text while shaking, fix plurality in retry label
f287dbeMichael Zanetti
qml/Greeter/Lockscreen.qml+1−1
@@ -109,7 +109,7 @@ Showable {
109 left: parent.left
109 left: parent.left
110 right: parent.right
110 right: parent.right
111 }
111 }
112− text: i18n.tr("%1 retries remaining").arg(root.retryCount)
112+ text: i18n.tr("%1 retry remaining", "%1 retries remaining", root.retryCount).arg(root.retryCount)
113 horizontalAlignment: Text.AlignHCenter
113 horizontalAlignment: Text.AlignHCenter
114 color: "#f3f3e7"
114 color: "#f3f3e7"
115 opacity: 0.6
115 opacity: 0.6
qml/Greeter/PinLockscreen.qml+1−1
@@ -88,7 +88,7 @@ Column {
88 id: pinentryFieldPlaceHolder
88 id: pinentryFieldPlaceHolder
89 anchors.centerIn: parent
89 anchors.centerIn: parent
90 color: "grey"
90 color: "grey"
91− text: parent.placeholderText
91+ text: wrongPasswordAnimation.running ? i18n.tr("Incorrect passcode") : parent.placeholderText
92 visible: pinentryFieldLabel.text.length == 0
92 visible: pinentryFieldLabel.text.length == 0
93 }
93 }
94
94