Merge lp:~unity-team/unity8/flickables-speed-workaround into lp:unity8

[Andrea Cimitan]

Let jenkins build pkgs

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1237
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4722/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1370
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13063

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4276/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/flickables-speed-workaround]

1237. By Andrea Cimitan on 2014-09-15

[ Pete Woods ]
* Disable OEM and Click scopes when system scopes are disabled
[ CI bot ]
* Resync trunk
[ Pawel Stolowski ]
* Set UNITY_SCOPES_NO_FAVORITES environment variable to make scopes
  plugin ignore favorite scopes and fix basic functionality of unity-
  scope-tool.

1238. By Andrea Cimitan on 2014-09-15

Bump requirements and add comments for GridView and ListView

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1238
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4837/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1408
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4599/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13235

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4314/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I'll review this after we land lp:~unity-team/unity8/scopes_more_things_on_memory

[lp:~unity-team/unity8/flickables-speed-workaround]

1239. By Andrea Cimitan on 2014-09-30

merged

1240. By Andrea Cimitan on 2014-09-30

merged slideshow branch

1241. By Andrea Cimitan on 2014-09-30

Flickables for menucontent

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1239
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4440/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5311
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1534
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6563
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13917

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4440/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1241
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4443/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5320
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1537
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13923

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4443/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in debian/control
Text conflict in plugins/Dash/CardCreator.js
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in qml/Dash/ScopeSettingsPage.qml
Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
Text conflict in qml/Panel/MenuContent.qml
Text conflict in tests/plugins/Dash/cardcreator/2.res
Text conflict in tests/plugins/Dash/cardcreator/7.res
Text conflict in tests/qmltests/Dash/tst_GenericScopeView.qml
9 conflicts encountered.

review: Needs Fixing

[lp:~unity-team/unity8/flickables-speed-workaround]

1242. By Andrea Cimitan on 2014-10-10

merge trunk

1243. By Andrea Cimitan on 2014-10-10

Attempt to merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1242
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4604/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5809/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1698
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5463/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14499

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4604/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'po/am.po'
--- po/am.po	2014-10-09 06:37:11 +0000
+++ po/am.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-08 00:48+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "አቋራጭ መለያያ"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "አካሉ ተቆልፏል"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት  ስልኩ ተቆልፏል"
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት  ስልኩ ተቆልፏል"
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
-msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "መውጫ"
@@ -155,23 +137,40 @@
 msgstr ""
 "አሁን የ ጠርዝ  እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "እባክዎን ይቆዩ"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "በርካታ የተሳሳቱ ሙከራዎች"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "የ ድንገተኛ ጥሪ"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "እሺ"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "ሰላም %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "ሰላም"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "አነስተኛ መመልከቻ"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "ሁሉንም መመልከቻ"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "መፈለጊያ"
@@ -208,14 +207,6 @@
 msgid "Send"
 msgstr "መላኪያ"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "ይሳቡ ለማነቃቃት…"
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "ይልቀቁ ለማነቃቃት…"
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "የ ክልል አስተዳዳሪ"
@@ -237,8 +228,8 @@
 msgstr "ሁሉንም"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "መክፈቻ"
+msgid "Swipe to unlock"
+msgstr "ለመክፈት ይጥረጉ"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -260,10 +251,18 @@
 msgid "Speaking..."
 msgstr "በመናገር ላይ..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "የመግቢያ ቃል ማሳያ"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "ሲም ፒን ያስገቡ"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "አዝናለሁ የተሳሳተ ፒን"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
@@ -308,49 +307,45 @@
 msgid "Roaming"
 msgstr "ማዘዋወሪያ"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "የ ማለፊያ ሀረግ ያስገቡ"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "የማለፊያ ሐረግ ያስገቡ"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "እባክዎን እንደገና-ያስገቡ"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "የ ማለፊያ ኮድ ያስገቡ"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "የ እርስዎን የማለፊያ ኮድ ያስገቡ"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "ማስገቢያ %1"
+msgid "Enter your %1"
+msgstr "ያስገቡ የ እርስዎን %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "አዝናለሁ: የተሳሳተ%1"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -358,7 +353,7 @@
 "የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
 "ይጠፋል"
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -366,8 +361,37 @@
 "የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
 "ይጠፋል"
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "አዝናለሁ የተሳሳተ ፒን"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "ሲም ፒን ያስገቡ"
+#~ msgid "Device Locked"
+#~ msgstr "አካሉ ተቆልፏል"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት  ስልኩ ተቆልፏል"
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት  ስልኩ ተቆልፏል"
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
+#~ msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "ይሳቡ ለማነቃቃት…"
+
+#~ msgid "Release to refresh…"
+#~ msgstr "ይልቀቁ ለማነቃቃት…"
+
+#~ msgid "Unlock"
+#~ msgstr "መክፈቻ"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "የ ማለፊያ ሀረግ ያስገቡ"
+
+#~ msgid "Please re-enter"
+#~ msgstr "እባክዎን እንደገና-ያስገቡ"
+
+#~ msgid "Enter passcode"
+#~ msgstr "የ ማለፊያ ኮድ ያስገቡ"
+
+#~ msgid "Enter %1"
+#~ msgstr "ማስገቢያ %1"

=== modified file 'po/ar.po'
--- po/ar.po	2014-10-09 06:37:11 +0000
+++ po/ar.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-05-22 08:22+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,25 +33,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -141,8 +123,7 @@
 
 #: qml/Components/EdgeDemo.qml:199
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
-msgstr ""
-"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
+msgstr "اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
 
 #: qml/Components/EdgeDemo.qml:226
 msgid "Well done"
@@ -156,23 +137,40 @@
 "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
 "الشاشة للبدء"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "مكالمة طوارئ"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "مرحبا %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "مرحبًا"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "شاهد أقل"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "ابحث"
@@ -209,14 +207,6 @@
 msgid "Send"
 msgstr "أرسل"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -238,8 +228,8 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "اسحب لفتح القفل"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -261,10 +251,18 @@
 msgid "Speaking..."
 msgstr "تتكلم الآن..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "عرض كلمة السر"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -309,55 +307,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/ast.po'
--- po/ast.po	2014-10-10 05:23:06 +0000
+++ po/ast.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-09 09:49+0000\n"
 "Last-Translator: ivarela <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,26 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Desanclar"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Preséu bloquiáu"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
-msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Zarrar sesión"
@@ -159,23 +140,40 @@
 "Agora yá domines los xestos de los berbesos y pues entamar a usar el "
 "teléfonu<br><br>Toca la pantalla pa comenzar"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Espera un segundu"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Munchos intentos incorreutos"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Llamada d'emerxencia"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "Aceutar"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hola %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hola"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Ver menos"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Ver too"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Guetar"
@@ -212,14 +210,6 @@
 msgid "Send"
 msgstr "Unviar"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Tirar p'anovar..."
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Soltar p'anovar..."
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Xestionar ámbitos"
@@ -241,8 +231,8 @@
 msgstr "Too"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Desbloquiar"
+msgid "Swipe to unlock"
+msgstr "Esliza pa desbloquiar"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -264,10 +254,18 @@
 msgid "Speaking..."
 msgstr "Falando…"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Amosar contraseña"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Escribi'l PIN de la SIM"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "PIN incorreutu"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Tocar pa tornar a la llamada..."
@@ -312,49 +310,45 @@
 msgid "Roaming"
 msgstr "Roaming"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "Escribi la frase contraseña"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Introduz contraseña"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Sentímoslo, contraseña incorreuta"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Vuelvi a escribila"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "Escribi'l códigu de pasu"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Introduz códigu de pasu"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Sentímoslo, códigu de pasu incorreutu"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "Escribi %1"
+msgid "Enter your %1"
+msgstr "Introduz %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Sentímoslo, %1 incorreutu"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Fras de pasu incorreuta"
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Códigu de pasu incorreutu"
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Esti ye'l caberu intentu."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -362,7 +356,7 @@
 "Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
 "configuración de fábrica y van perdese tolos datos personales."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -370,8 +364,39 @@
 "Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
 "configuración de fábrica y van perdese tolos datos personales."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "PIN incorreutu"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Escribi'l PIN de la SIM"
+#~ msgid "Device Locked"
+#~ msgstr "Preséu bloquiáu"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
+#~ msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Tirar p'anovar..."
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Soltar p'anovar..."
+
+#~ msgid "Unlock"
+#~ msgstr "Desbloquiar"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Escribi la frase contraseña"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Vuelvi a escribila"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Escribi'l códigu de pasu"
+
+#~ msgid "Enter %1"
+#~ msgstr "Escribi %1"

=== modified file 'po/az.po'
--- po/az.po	2014-10-09 06:37:11 +0000
+++ po/az.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-09-03 16:39+0000\n"
 "Last-Translator: Nicat Məmmədov <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Açma qısayolu"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Çıxış"
@@ -140,8 +122,7 @@
 
 #: qml/Components/EdgeDemo.qml:199
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
-msgstr ""
-"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
+msgstr "Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
 
 #: qml/Components/EdgeDemo.qml:226
 msgid "Well done"
@@ -155,23 +136,40 @@
 "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
 "bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Xahiş edirik gözləyin"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Çoxlu yanlış cəhdlәr"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Zərurət zəngi"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "Oldu"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Salam %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Salam"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Daha azını gör"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Hamısını gör"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Axtar"
@@ -208,14 +206,6 @@
 msgid "Send"
 msgstr "Göndər"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -237,8 +227,8 @@
 msgstr "Hamısı"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "Kilidi açmaq üçün sürüşdürün"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -260,10 +250,18 @@
 msgid "Speaking..."
 msgstr "Danışır..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Şifrәni göstәr"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "SIM PIN kodunuzu daxil edin"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Bağışlayın, PIN yanlışdır"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Zəngə qayıtmaq üçün toxunun..."
@@ -308,49 +306,45 @@
 msgid "Roaming"
 msgstr "Rominq"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr ""
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Açar sözünüzü daxil edin"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Bağışlayın, açar söz yanlışdır"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr ""
+msgid "Enter your %1"
+msgstr "%1 daxil edin"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Bağışlayın, %1 yanlışdır"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Bağışlayın, açar söz yanlışdır."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Təəssüf ki, açar kod yanlışdır."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Bu sizin son cəhdiniz olacaq."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -358,16 +352,10 @@
 "Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
 "geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
 msgstr ""
 "Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
 "geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "SIM PIN kodunuzu daxil edin"
-
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Bağışlayın, PIN yanlışdır"

=== modified file 'po/bg.po'
--- po/bg.po	2014-10-09 06:37:11 +0000
+++ po/bg.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-04-01 14:08+0000\n"
 "Last-Translator: Atanas Kovachki <Unknown>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -159,23 +141,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Спешно повикване"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Здравей, %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Здравей"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Търсене"
@@ -212,14 +211,6 @@
 msgid "Send"
 msgstr "Изпрати"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -241,7 +232,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -264,10 +255,18 @@
 msgid "Speaking..."
 msgstr "Говорете..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Покажи паролата"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -312,55 +311,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/br.po'
--- po/br.po	2014-10-09 06:37:11 +0000
+++ po/br.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-07 07:03+0000\n"
 "Last-Translator: Fohanno Thierry <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
+"Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,29 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Dispilhennañ ar verradenn"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Benveg prennet"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "
-"ho frazenn-dremen."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"
-"tremen."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
-msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Digevreañ"
@@ -165,23 +143,40 @@
 "Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
 "pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Gortozit, mar plij"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Re a daolioù-esae direizh"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Pellgomzadenn vallus"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "Mat eo"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Demat %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Demat"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Gwelet nebeutoc'h"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Gwelet pep tra"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Klask"
@@ -218,14 +213,6 @@
 msgid "Send"
 msgstr "Kas"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Tennañ evit freskaat..."
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Lezel da vont evit freskaat..."
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Merañ ar c'hefluskerioù enklask"
@@ -247,8 +234,8 @@
 msgstr "An holl anezho"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Dibrennañ"
+msgid "Swipe to unlock"
+msgstr "Riklañ evit dibrennañ"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -270,10 +257,18 @@
 msgid "Speaking..."
 msgstr "O komz..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Diskouez ar ger-tremen"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Ebarzhit kod PIN ar gartenn SIM"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Siwazh, kod PIN direizh"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
@@ -318,49 +313,45 @@
 msgid "Roaming"
 msgstr "O kantren"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "Merkañ ar frazenn-dremen"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Ebarzhit ho frazenn-dremen"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Siwazh, frazenn-dremen direizh"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Adverkañ, mar plij"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "Merkañ ar c'hod-tremen"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Ebarzhit ho kod-tremen"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Digarezit, kod-tremen direizh"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "Merkañ  %1"
+msgid "Enter your %1"
+msgstr "Ebarzhit ho %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Siwazh, %1 direizh"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Siwazh, frazenn-dremen direizh"
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Siwazh, kod-tremen direizh"
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Ho taol-esae diwezhañ e vo."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -368,7 +359,7 @@
 "Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
 "gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -376,8 +367,41 @@
 "Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
 "gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Siwazh, kod PIN direizh"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Ebarzhit kod PIN ar gartenn SIM"
+#~ msgid "Device Locked"
+#~ msgstr "Benveg prennet"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit "
+#~ "merkañ ho frazenn-dremen."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho "
+#~ "kod-tremen."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
+#~ msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Tennañ evit freskaat..."
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Lezel da vont evit freskaat..."
+
+#~ msgid "Unlock"
+#~ msgstr "Dibrennañ"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Merkañ ar frazenn-dremen"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Adverkañ, mar plij"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Merkañ ar c'hod-tremen"
+
+#~ msgid "Enter %1"
+#~ msgstr "Merkañ  %1"

=== modified file 'po/bs.po'
--- po/bs.po	2014-10-09 06:37:11 +0000
+++ po/bs.po	2014-10-10 11:13:44 +0000
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-01-16 22:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian <[e-mail]>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
@@ -32,25 +33,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -153,23 +135,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr ""
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr ""
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
@@ -206,14 +205,6 @@
 msgid "Send"
 msgstr ""
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -235,7 +226,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -258,10 +249,18 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr ""
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -306,55 +305,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/ca.po'
--- po/ca.po	2014-10-09 06:37:11 +0000
+++ po/ca.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-07 10:51+0000\n"
 "Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,29 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Desenganxa la drecera"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Dispositiu bloquejat"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
-"d'intents d'introducció de la contrasenya."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
-"d'intents d'introducció del codi d'accés."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
-msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Surt"
@@ -122,8 +100,7 @@
 
 #: qml/Components/EdgeDemo.qml:113
 msgid "Try swiping from the right edge to unlock the phone"
-msgstr ""
-"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
+msgstr "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
 
 #: qml/Components/EdgeDemo.qml:144
 msgid "Top edge"
@@ -166,23 +143,40 @@
 "Ja heu après com utilitzar els gestos de les vores per fer servir el "
 "telèfon<br><br>Feu un toc a la pantalla per començar"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Espereu"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Massa intents incorrectes"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Trucada d'emergència"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "D'acord"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hola %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hola"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Mostra'n menys"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Mostra-ho tot"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Cerca"
@@ -219,14 +213,6 @@
 msgid "Send"
 msgstr "Envia"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Estireu per actualitzar..."
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Deixeu anar per actualitzar..."
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Gestioneu les lents"
@@ -248,8 +234,8 @@
 msgstr "Totes"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Desbloca"
+msgid "Swipe to unlock"
+msgstr "Feu lliscar el dit per desbloquejar"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -271,10 +257,18 @@
 msgid "Speaking..."
 msgstr "S'està parlant..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Mostra la contrasenya"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Introduïu el PIN de la targeta SIM"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "El PIN no és correcte"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Feu un toc per tornar a la trucada..."
@@ -319,49 +313,45 @@
 msgid "Roaming"
 msgstr "Itinerància"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "Introduïu la contrasenya"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Escriviu la contrasenya"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "La contrasenya no és correcta"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Torneu-ho a introduir"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
 msgstr "Introduïu el codi d'accés"
 
-#: qml/Shell.qml:351
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "El codi d'accés no és correcte"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "Introduïu: %1"
+msgid "Enter your %1"
+msgstr "Introduïu la %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Incorrecte (%1)"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "La contrasenya és incorrecta"
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "El codi d'accés no és correcte"
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Aquest serà el darrer intent."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -370,7 +360,7 @@
 "reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
 "personals."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -379,8 +369,41 @@
 "reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
 "personals."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "El PIN no és correcte"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Introduïu el PIN de la targeta SIM"
+#~ msgid "Device Locked"
+#~ msgstr "Dispositiu bloquejat"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
+#~ "d'intents d'introducció de la contrasenya."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
+#~ "d'intents d'introducció del codi d'accés."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
+#~ msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Estireu per actualitzar..."
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Deixeu anar per actualitzar..."
+
+#~ msgid "Unlock"
+#~ msgstr "Desbloca"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Introduïu la contrasenya"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Torneu-ho a introduir"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Introduïu el codi d'accés"
+
+#~ msgid "Enter %1"
+#~ msgstr "Introduïu: %1"

=== modified file 'po/ckb.po'
--- po/ckb.po	2014-10-09 06:37:11 +0000
+++ po/ckb.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-01-21 11:05+0000\n"
 "Last-Translator: Aras <[e-mail]>\n"
 "Language-Team: Kurdish (Sorani) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -152,23 +134,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "هێڵی فریاگوزاری"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "سڵاو %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "سڵاو"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "گەڕان"
@@ -205,14 +204,6 @@
 msgid "Send"
 msgstr "ناردن"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -234,7 +225,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -257,10 +248,18 @@
 msgid "Speaking..."
 msgstr "قسە دەکات..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "تێپەڕەوشە پیشان بدە"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -305,55 +304,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/cs.po'
--- po/cs.po	2014-10-09 06:37:11 +0000
+++ po/cs.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-01-08 10:11+0000\n"
 "Last-Translator: Tadeáš Pařík <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -152,23 +134,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Tísňové volání"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Ahoj %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Ahoj"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Hledat"
@@ -205,14 +204,6 @@
 msgid "Send"
 msgstr "Odeslat"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -234,7 +225,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -257,10 +248,18 @@
 msgid "Speaking..."
 msgstr "Mluvte..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Zobrazit heslo"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -305,55 +304,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/da.po'
--- po/da.po	2014-10-09 06:37:11 +0000
+++ po/da.po	2014-10-10 11:13:44 +0000
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-07-30 12:37+0000\n"
 "Last-Translator: Ask Hjorth Larsen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,25 +33,6 @@
 msgid "Unpin shortcut"
 msgstr "Gør genvej flytbar"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -155,23 +137,40 @@
 "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
 "på skærmen for at starte"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Nødopkald"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "O.k."
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hej %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hej"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Vis mindre"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Se alle"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Søg"
@@ -208,14 +207,6 @@
 msgid "Send"
 msgstr "Send"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -237,8 +228,8 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "Stryg for at låse op"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -260,10 +251,18 @@
 msgid "Speaking..."
 msgstr "Taler..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Vis adgangskode"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Tryk for at besvare opkaldet..."
@@ -308,55 +307,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/de.po'
--- po/de.po	2014-10-09 06:37:11 +0000
+++ po/de.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-09-29 06:33+0000\n"
 "Last-Translator: Niklas Wenzel <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Verknüpfung entfernen"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Abmelden"
@@ -159,23 +141,40 @@
 "Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
 "nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Zu viele falsche Versuche"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Notruf"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "OK"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hallo %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hallo"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Weniger ansehen"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Alle anzeigen"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Suchen"
@@ -212,14 +211,6 @@
 msgid "Send"
 msgstr "Senden"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Filter verwalten"
@@ -241,8 +232,8 @@
 msgstr "Alle"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "Wischen zum Entsperren"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -264,10 +255,18 @@
 msgid "Speaking..."
 msgstr "Sprechen Sie …"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Geben Sie die SIM-PIN ein"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Die PIN ist nicht korrekt"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Tippen um zum Anruf zurückzugehen"
@@ -312,49 +311,45 @@
 msgid "Roaming"
 msgstr "Roaming"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr ""
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Geben Sie Ihr Passwort ein"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Das Passwort ist nicht korrekt"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Passwort eingeben"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Falsches Passwort"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr ""
+msgid "Enter your %1"
+msgstr "%1 eingeben"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "%1 falsch"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Falsches Passwort."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Falsche PIN"
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Dies ist Ihr letzter Versuch."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -362,16 +357,10 @@
 "Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
 "zurückgesetzt und alle Daten werden gelöscht."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
 msgstr ""
 "Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
 "zurückgesetzt und alle Daten werden gelöscht."
-
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Die PIN ist nicht korrekt"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Geben Sie die SIM-PIN ein"

=== modified file 'po/el.po'
--- po/el.po	2014-10-09 06:37:11 +0000
+++ po/el.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-08-21 12:06+0000\n"
 "Last-Translator: Chris Taklis (aka Kailor) <[e-mail]>\n"
 "Language-Team: Greek <[e-mail]>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Ξεκαρφίτσωμα συντόμευσης"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -156,23 +138,40 @@
 "Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
 "χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Πολλές άκυρες προσπάθειες"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Κλήση έκτακτης ανάγκης"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "OK"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Γεια σας %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Γεια σας"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Λιγότερα"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Εμφάνιση όλων"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -209,14 +208,6 @@
 msgid "Send"
 msgstr "Αποστολή"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -238,8 +229,8 @@
 msgstr "Όλα"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "Σύρετε για να ξεκλειδώσετε"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -261,10 +252,18 @@
 msgid "Speaking..."
 msgstr "Ομιλία..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Εμφάνιση κωδικού"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Πατήστε για να γυρίσετε στην κλήση..."
@@ -309,55 +308,51 @@
 msgid "Roaming"
 msgstr "Περιαγωγή"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr ""
+msgid "Enter your %1"
+msgstr "Εισάγετε το %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2014-10-09 06:37:11 +0000
+++ po/en_AU.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-09-23 01:24+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Unpin shortcut"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Log out"
@@ -156,23 +138,40 @@
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Please wait"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Too many incorrect attempts"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Emergency Call"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "OK"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hello %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hello"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "See less"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "See all"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Search"
@@ -209,14 +208,6 @@
 msgid "Send"
 msgstr "Send"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -238,8 +229,8 @@
 msgstr "All"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr ""
+msgid "Swipe to unlock"
+msgstr "Swipe to unlock"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -261,10 +252,18 @@
 msgid "Speaking..."
 msgstr "Speaking..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Show password"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Enter SIM PIN"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Sorry, incorrect PIN"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Tap to return to call..."
@@ -309,66 +308,56 @@
 msgid "Roaming"
 msgstr "Roaming"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr ""
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Enter your passphrase"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Sorry, incorrect passphrase"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Enter your passcode"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Sorry, incorrect passcode"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr ""
+msgid "Enter your %1"
+msgstr "Enter your %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Sorry, incorrect %1"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Sorry, incorrect passphrase."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Sorry, incorrect passcode."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "This will be your last attempt."
 
-#: qml/Shell.qml:394
-msgid ""
-"If passphrase is entered incorrectly, your phone will conduct a factory "
-"reset and all personal data will be deleted."
-msgstr ""
-"If passphrase is entered incorrectly, your phone will conduct a factory "
-"reset and all personal data will be deleted."
-
-#: qml/Shell.qml:395
-msgid ""
-"If passcode is entered incorrectly, your phone will conduct a factory reset "
-"and all personal data will be deleted."
-msgstr ""
-"If passcode is entered incorrectly, your phone will conduct a factory reset "
-"and all personal data will be deleted."
-
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Sorry, incorrect PIN"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Enter SIM PIN"
+#: qml/Shell.qml:367
+msgid ""
+"If passphrase is entered incorrectly, your phone will conduct a factory "
+"reset and all personal data will be deleted."
+msgstr ""
+"If passphrase is entered incorrectly, your phone will conduct a factory "
+"reset and all personal data will be deleted."
+
+#: qml/Shell.qml:368
+msgid ""
+"If passcode is entered incorrectly, your phone will conduct a factory reset "
+"and all personal data will be deleted."
+msgstr ""
+"If passcode is entered incorrectly, your phone will conduct a factory reset "
+"and all personal data will be deleted."

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-10-09 06:37:11 +0000
+++ po/en_GB.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-03 12:46+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Unpin shortcut"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Device Locked"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr "You have been locked out due to too many failed passphrase attempts."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr "You have been locked out due to too many failed passcode attempts."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Please wait %1 minute and then try again…"
-msgstr[1] "Please wait %1 minutes and then try again…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Log out"
@@ -156,23 +138,40 @@
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Please wait"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Too many incorrect attempts"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Emergency Call"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "OK"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hello %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hello"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "See less"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "See all"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Search"
@@ -209,14 +208,6 @@
 msgid "Send"
 msgstr "Send"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Pull to refresh…"
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Release to refresh…"
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Manage Scopes"
@@ -238,8 +229,8 @@
 msgstr "All"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Unlock"
+msgid "Swipe to unlock"
+msgstr "Swipe to unlock"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -261,10 +252,18 @@
 msgid "Speaking..."
 msgstr "Speaking..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Show password"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Enter SIM PIN"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Sorry, incorrect PIN"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Tap to return to call..."
@@ -309,66 +308,92 @@
 msgid "Roaming"
 msgstr "Roaming"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Enter your passphrase"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Sorry, incorrect passphrase"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Please re-enter"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "Enter passcode"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Enter your passcode"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Sorry, incorrect passcode"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "Enter %1"
+msgid "Enter your %1"
+msgstr "Enter your %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Sorry, incorrect %1"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Sorry, incorrect passphrase."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Sorry, incorrect passcode."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "This will be your last attempt."
 
-#: qml/Shell.qml:394
-msgid ""
-"If passphrase is entered incorrectly, your phone will conduct a factory "
-"reset and all personal data will be deleted."
-msgstr ""
-"If passphrase is entered incorrectly, your phone will conduct a factory "
-"reset and all personal data will be deleted."
-
-#: qml/Shell.qml:395
-msgid ""
-"If passcode is entered incorrectly, your phone will conduct a factory reset "
-"and all personal data will be deleted."
-msgstr ""
-"If passcode is entered incorrectly, your phone will conduct a factory reset "
-"and all personal data will be deleted."
-
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Sorry, incorrect PIN"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Enter SIM PIN"
+#: qml/Shell.qml:367
+msgid ""
+"If passphrase is entered incorrectly, your phone will conduct a factory "
+"reset and all personal data will be deleted."
+msgstr ""
+"If passphrase is entered incorrectly, your phone will conduct a factory "
+"reset and all personal data will be deleted."
+
+#: qml/Shell.qml:368
+msgid ""
+"If passcode is entered incorrectly, your phone will conduct a factory reset "
+"and all personal data will be deleted."
+msgstr ""
+"If passcode is entered incorrectly, your phone will conduct a factory reset "
+"and all personal data will be deleted."
+
+#~ msgid "Device Locked"
+#~ msgstr "Device Locked"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "You have been locked out due to too many failed passphrase attempts."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr "You have been locked out due to too many failed passcode attempts."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Please wait %1 minute and then try again…"
+#~ msgstr[1] "Please wait %1 minutes and then try again…"
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Pull to refresh…"
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Release to refresh…"
+
+#~ msgid "Unlock"
+#~ msgstr "Unlock"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Enter passphrase"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Please re-enter"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Enter passcode"
+
+#~ msgid "Enter %1"
+#~ msgstr "Enter %1"

=== modified file 'po/eo.po'
--- po/eo.po	2014-10-09 06:37:11 +0000
+++ po/eo.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2013-06-26 22:35+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -152,23 +134,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr ""
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr ""
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
@@ -205,14 +204,6 @@
 msgid "Send"
 msgstr ""
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -234,7 +225,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -257,10 +248,18 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr ""
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -305,55 +304,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/es.po'
--- po/es.po	2014-10-10 05:23:06 +0000
+++ po/es.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-09 07:43+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,29 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Desanclar"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Dispositivo bloqueado"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "
-"el dispositivo."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "
-"desbloqueo."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
-msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Cerrar la sesión"
@@ -130,8 +108,7 @@
 
 #: qml/Components/EdgeDemo.qml:145
 msgid "Try swiping from the top edge to access the indicators"
-msgstr ""
-"Deslice el dedo desde el borde superior para acceder a los indicadores"
+msgstr "Deslice el dedo desde el borde superior para acceder a los indicadores"
 
 #: qml/Components/EdgeDemo.qml:170
 msgid "Close"
@@ -163,23 +140,40 @@
 "Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
 "la pantalla para comenzar"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Espere un momento"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Demasiados intentos incorrectos"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Llamada de emergencia"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "Aceptar"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hola, %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hola"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Ver menos"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Ver todo"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Buscar"
@@ -216,14 +210,6 @@
 msgid "Send"
 msgstr "Enviar"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Deslice para actualizar…"
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Suelte para actualizar…"
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Administrar ámbitos"
@@ -245,8 +231,8 @@
 msgstr "Todo"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Desbloquear"
+msgid "Swipe to unlock"
+msgstr "Deslice para desbloquear"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -268,10 +254,18 @@
 msgid "Speaking..."
 msgstr "Hablando…"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Escriba el PIN de la SIM"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "El PIN es incorrecto"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Toque para volver a llamar..."
@@ -316,49 +310,45 @@
 msgid "Roaming"
 msgstr "Itinerancia"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "Introduzca la contraseña"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "Escriba su contraseña"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "La contraseña es incorrecta"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Reintroduzca"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "Introduzca el código"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "Escriba su código de acceso"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "El código es incorrecto"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "Introduzca %1"
+msgid "Enter your %1"
+msgstr "Introduzca su %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Incorrecto (%1)"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "La contraseña es incorrecta."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Código de acceso incorrecto."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Este será su último intento."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -366,7 +356,7 @@
 "Si se introduce la frase incorrectamente, el teléfono volverá a la "
 "configuración de fábrica y se perderán todos los datos personales."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -374,8 +364,41 @@
 "Si se introduce el código incorrectamente, el teléfono volverá a la "
 "configuración de fábrica y se perderán todos los datos personales."
 
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Escriba el PIN de la SIM"
-
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "El PIN es incorrecto"
+#~ msgid "Device Locked"
+#~ msgstr "Dispositivo bloqueado"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Se ha proporcionado una contraseña errónea demasiadas veces. Se ha "
+#~ "bloqueado el dispositivo."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Se ha bloqueado el dispositivo debido al gran número de intentos fallidos "
+#~ "de desbloqueo."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
+#~ msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Deslice para actualizar…"
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Suelte para actualizar…"
+
+#~ msgid "Unlock"
+#~ msgstr "Desbloquear"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Introduzca la contraseña"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Reintroduzca"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Introduzca el código"
+
+#~ msgid "Enter %1"
+#~ msgstr "Introduzca %1"

=== modified file 'po/eu.po'
--- po/eu.po	2014-10-09 06:37:11 +0000
+++ po/eu.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-07 19:21+0000\n"
 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
 "Language-Team: Basque <[e-mail]>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,28 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Askatu lasterbidea"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Gailua blokeatuta"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "
-"dituzulako."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
-msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Amaitu saioa"
@@ -119,8 +98,7 @@
 
 #: qml/Components/EdgeDemo.qml:113
 msgid "Try swiping from the right edge to unlock the phone"
-msgstr ""
-"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
+msgstr "Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
 
 #: qml/Components/EdgeDemo.qml:144
 msgid "Top edge"
@@ -160,23 +138,40 @@
 "Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
 "zaitezke<br><br>Sakatu pantailan hasteko"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Itxaron"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Okerreko saiakera gehiegi"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Larrialdi-deia"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "Ados"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Kaixo %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Kaixo"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Ikusi gutxiago"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Ikusi guztiak"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Bilatu"
@@ -213,14 +208,6 @@
 msgid "Send"
 msgstr "Bidali"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Tiratu freskatzeko…"
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Askatu freskatzeko…"
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Kudeatu eremuak"
@@ -242,8 +229,8 @@
 msgstr "Guztiak"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Desblokeatu"
+msgid "Swipe to unlock"
+msgstr "Pasatu hatza desblokeatzeko"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -265,10 +252,18 @@
 msgid "Speaking..."
 msgstr "Hitz egiten..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Erakutsi pasahitza"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Sartu SIMaren PINa"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Sentitzen dugu, PINa okerrekoa da"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Sakatu deira itzultzeko..."
@@ -313,49 +308,45 @@
 msgid "Roaming"
 msgstr "Ibiltaritza"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr "Sartu pasaesaldia"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Errepikatu"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
 msgstr "Sartu pasakodea"
 
-#: qml/Shell.qml:351
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Sentitzen dugu, pasakodea okerrekoa da"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr "Sartu %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Sentitzen dugu, %1 okerrekoa da"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Sentitzen dugu, pasakodea okerrekoa da."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Hau duzu azken saiakera."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -363,7 +354,7 @@
 "Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
 "berrezarri eta datu pertsonal guztiak ezabatuko dira."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -371,8 +362,41 @@
 "Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
 "berrezarri eta datu pertsonal guztiak ezabatuko dira."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Sentitzen dugu, PINa okerrekoa da"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Sartu SIMaren PINa"
+#~ msgid "Device Locked"
+#~ msgstr "Gailua blokeatuta"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "
+#~ "dituzulako."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin "
+#~ "dituzulako."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
+#~ msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Tiratu freskatzeko…"
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Askatu freskatzeko…"
+
+#~ msgid "Unlock"
+#~ msgstr "Desblokeatu"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Sartu pasaesaldia"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Errepikatu"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Sartu pasakodea"
+
+#~ msgid "Enter %1"
+#~ msgstr "Sartu %1"

=== modified file 'po/fa.po'
--- po/fa.po	2014-10-09 06:37:11 +0000
+++ po/fa.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity8\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-02 23:07+0000\n"
 "Last-Translator: Danial Behzadi <[e-mail]>\n"
 "Language-Team: Persian <[e-mail]>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "برداشتن سنجاق میانبر"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "دستگاه قفل شد"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "خروج از حساب"
@@ -156,23 +138,40 @@
 "هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
 "از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "لطفاً صبر کنید"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "تلاش‌های ناموفّق زیاد"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "تماس اضطراری"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "قبول"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "سلام %1"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "سلام"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "کم‌تر ببینید"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "دیدن همه"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "جست‌وجو"
@@ -209,14 +208,6 @@
 msgid "Send"
 msgstr "ارسال"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "مدیریت حوزه‌ها"
@@ -238,8 +229,8 @@
 msgstr "همه"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "بازکردن قفل"
+msgid "Swipe to unlock"
+msgstr "برای باز کردن قفل بکشد"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -261,10 +252,18 @@
 msgid "Speaking..."
 msgstr "در حال صحبت کردن…"
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "نمایش گذرواژه"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "PIN سیم‌کارت را وارد کنید"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "متأسّفیم، PIN نادرست بود"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "برای بازگشت به تماس ضربه بزنید…"
@@ -309,49 +308,45 @@
 msgid "Roaming"
 msgstr "رومینگ"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
-msgstr "عبارت‌عبور را وارد کنید"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
+msgstr "عبارت‌عبورتان را وارد کنید"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "لطفاً دوباره وارد کنید"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr "رمزعبور را وارد کنید"
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr "رمزعبورتان را وارد کنید"
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "متأسّفیم، رمزعبور نادرست بود"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
-msgstr "%1 را وارد کنید"
+msgid "Enter your %1"
+msgstr "%1 خود را وارد کنید"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "متأسّفیم، %1 نادرست بود"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "متأسّفیم، عبارت‌عبور نادرست است."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "متأسّفیم، رمزعبور نادرست است."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "این آخرین تلاش شما خواهد بود."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -359,7 +354,7 @@
 "اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
 "اطّلاعات شخصی حذف خواهند شد."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -367,8 +362,31 @@
 "اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
 "اطّلاعات شخصی حذف خواهند شد."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "متأسّفیم، PIN نادرست بود"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "PIN سیم‌کارت را وارد کنید"
+#~ msgid "Device Locked"
+#~ msgstr "دستگاه قفل شد"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
+
+#~ msgid "Unlock"
+#~ msgstr "بازکردن قفل"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "عبارت‌عبور را وارد کنید"
+
+#~ msgid "Please re-enter"
+#~ msgstr "لطفاً دوباره وارد کنید"
+
+#~ msgid "Enter passcode"
+#~ msgstr "رمزعبور را وارد کنید"
+
+#~ msgid "Enter %1"
+#~ msgstr "%1 را وارد کنید"

=== modified file 'po/fi.po'
--- po/fi.po	2014-10-09 06:37:11 +0000
+++ po/fi.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-07 13:10+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,27 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Poista pikakuvakkeen kiinnitys"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Laite on lukittu"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
-msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Kirjaudu ulos"
@@ -158,23 +138,40 @@
 "Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
 "käytön<br><br>Napauta näyttöä aloittaaksesi"
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr "Odota hetki"
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr "Liian monta virheellistä yritystä"
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr "Hätäpuhelu"
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr "OK"
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr "Hei %1!"
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr "Hei"
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr "Näytä vähemmän"
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr "Näytä kaikki"
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Hae"
@@ -211,14 +208,6 @@
 msgid "Send"
 msgstr "Lähetä"
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr "Vedä päivittääksesi…"
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr "Vapauta päivittääksesi…"
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr "Näkymien hallinta"
@@ -240,8 +229,8 @@
 msgstr "Kaikki"
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
-msgstr "Avaa lukitus"
+msgid "Swipe to unlock"
+msgstr "Avaa pyyhkäisemällä"
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
 msgid "Confirm"
@@ -263,10 +252,18 @@
 msgid "Speaking..."
 msgstr "Puhutaan..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr "Näytä salasana"
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr "Anna SIM-kortin PIN-koodi"
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr "Väärä PIN-koodi"
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr "Napauta palataksesi puheluun..."
@@ -311,49 +308,45 @@
 msgid "Roaming"
 msgstr "Verkkovierailu"
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr "Anna tunnuslause"
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr "Virheellinen tunnuslause"
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr "Anna uudelleen"
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
 msgstr "Anna suojakoodi"
 
-#: qml/Shell.qml:351
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr "Väärä suojakoodi"
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr "Anna %1"
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr "Väärä %1"
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr "Virheellinen tunnuslause."
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr "Virheellinen suojakoodi."
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr "Tämä on viimeinen yritys."
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
@@ -361,7 +354,7 @@
 "Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
 "tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."
@@ -369,8 +362,39 @@
 "Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
 "tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
 
-#~ msgid "Sorry, incorrect PIN"
-#~ msgstr "Väärä PIN-koodi"
-
-#~ msgid "Enter SIM PIN"
-#~ msgstr "Anna SIM-kortin PIN-koodi"
+#~ msgid "Device Locked"
+#~ msgstr "Laite on lukittu"
+
+#~ msgid "You have been locked out due to too many failed passphrase attempts."
+#~ msgstr ""
+#~ "Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."
+
+#~ msgid "You have been locked out due to too many failed passcode attempts."
+#~ msgstr ""
+#~ "Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."
+
+#~ msgid "Please wait %1 minute and then try again…"
+#~ msgid_plural "Please wait %1 minutes and then try again…"
+#~ msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
+#~ msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
+
+#~ msgid "Pull to refresh…"
+#~ msgstr "Vedä päivittääksesi…"
+
+#~ msgid "Release to refresh…"
+#~ msgstr "Vapauta päivittääksesi…"
+
+#~ msgid "Unlock"
+#~ msgstr "Avaa lukitus"
+
+#~ msgid "Enter passphrase"
+#~ msgstr "Anna tunnuslause"
+
+#~ msgid "Please re-enter"
+#~ msgstr "Anna uudelleen"
+
+#~ msgid "Enter passcode"
+#~ msgstr "Anna suojakoodi"
+
+#~ msgid "Enter %1"
+#~ msgstr "Anna %1"

=== modified file 'po/fo.po'
--- po/fo.po	2014-10-09 06:37:11 +0000
+++ po/fo.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-01-14 20:08+0000\n"
 "Last-Translator: Jógvan Olsen <[e-mail]>\n"
 "Language-Team: Faroese <[e-mail]>\n"
+"Language: fo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr ""
@@ -152,23 +134,40 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:167
+msgid "Please wait"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:172
+msgid "Too many incorrect attempts"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:206
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:226
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
+#: qml/Components/PassphraseLockscreen.qml:61
+#, qt-format
+msgid "Hello %1"
+msgstr ""
+
+#: qml/Components/PassphraseLockscreen.qml:61
+msgid "Hello"
+msgstr ""
+
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:434
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr "Leita"
@@ -205,14 +204,6 @@
 msgid "Send"
 msgstr ""
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
-msgid "Pull to refresh…"
-msgstr ""
-
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
-msgid "Release to refresh…"
-msgstr ""
-
 #: qml/Dash/ScopesOverview.qml:206
 msgid "Manage Scopes"
 msgstr ""
@@ -234,7 +225,7 @@
 msgstr ""
 
 #: qml/Greeter/Greeter.qml:157
-msgid "Unlock"
+msgid "Swipe to unlock"
 msgstr ""
 
 #: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -257,10 +248,18 @@
 msgid "Speaking..."
 msgstr "Snakkar..."
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:116
+#: qml/Notifications/NotificationMenuItemFactory.qml:108
 msgid "Show password"
 msgstr ""
 
+#: qml/Notifications/NotificationMenuItemFactory.qml:124
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: qml/Notifications/NotificationMenuItemFactory.qml:125
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -305,55 +304,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
-msgid "Enter passphrase"
+#: qml/Shell.qml:320
+msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Shell.qml:350
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Shell.qml:351
+#: qml/Shell.qml:323
+msgid "Enter your passcode"
+msgstr ""
+
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:327
 #, qt-format
-msgid "Enter %1"
+msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/fr.po'
--- po/fr.po	2014-10-10 05:23:06 +0000
+++ po/fr.po	2014-10-10 11:13:44 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: 2014-10-09 19:00+0000\n"
 "Last-Translator: Anne <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,29 +32,6 @@
 msgid "Unpin shortcut"
 msgstr "Détacher le raccourci"
 
-#: qml/Components/DelayedLockscreen.qml:47
-msgid "Device Locked"
-msgstr "Périphérique verrouillé"
-
-#: qml/Components/DelayedLockscreen.qml:62
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
-"d'une phrase de passe erronée."
-
-#: qml/Components/DelayedLockscreen.qml:63
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
-"d'un mot de passe erroné."
-
-#: qml/Components/DelayedLockscreen.qml:72
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] "Veuillez patienter %1 minute et réessayer..."
-msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
-
 #: qml/Components/Dialogs.qml:70
 msgid "Log out"
 msgstr "Se déconnecter"
@@ -122,8 +100,7 @@
 
 #: qml/Components/EdgeDemo.qml:113
 msgid "Try swiping from the right edge to unlock the phone"
-msgstr ""