git.iko.soy/unity8
on xenial help sign in
Passcode, not PIN Fixes: 1361114

Approved by: Michael Zanetti, PS Jenkins bot

commit4e4ad29465ba1d3bfd0bb1c87242f705e8f3ea5c authorMichał Sawicz <michal.sawicz@canonical.com> dateWed 27 Aug 2014, 15:36 (12 years ago) parentb824684219c803
3 files changed+11−7
compare with xenial
unifiedsplit
po/unity8.pot+7−3 qml/Shell.qml+2−2 tests/qmltests/tst_ShellWithPin.qml+2−2
po/unity8.pot+7−3
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-08-26 14:04+0200\n"
11+"POT-Creation-Date: 2014-08-26 18:24+0200\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -250,7 +250,7 @@ msgstr ""
250250msgid "Enter SIM PIN"
251251msgstr ""
252252
253−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:283
253+#: qml/Notifications/NotificationMenuItemFactory.qml:121
254254msgid "Sorry, incorrect PIN"
255255msgstr ""
256256
@@ -303,7 +303,11 @@ msgid "Sorry, incorrect passphrase"
303303msgstr ""
304304
305305#: qml/Shell.qml:282
306−msgid "Enter your PIN"
306+msgid "Enter your passcode"
307+msgstr ""
308+
309+#: qml/Shell.qml:283
310+msgid "Sorry, incorrect passcode"
307311msgstr ""
308312
309313#: qml/Shell.qml:286
qml/Shell.qml+2−2
@@ -279,8 +279,8 @@ Item {
279279 lockscreen.infoText = i18n.tr("Enter your passphrase")
280280 lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
281281 } else {
282− lockscreen.infoText = i18n.tr("Enter your PIN")
283− lockscreen.errorText = i18n.tr("Sorry, incorrect PIN")
282+ lockscreen.infoText = i18n.tr("Enter your passcode")
283+ lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
284284 }
285285 } else {
286286 lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
tests/qmltests/tst_ShellWithPin.qml+2−2
@@ -220,10 +220,10 @@ Item {
220220 tryCompare(placeHolder, "text", "")
221221
222222 enterPin("1111")
223− tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
223+ tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
224224
225225 enterPin("1111")
226− tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
226+ tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
227227
228228 enterPin("1111")
229229 tryCompare(placeHolder, "text", "Too many incorrect attempts")